From a4de5673de10e1623c893b7f107825daaacb5420 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sat, 8 Jun 2019 17:54:17 +0200 Subject: nvidia-x11: Put absolute library paths into ICD config files. --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 56012aafea9c..c403e3916cb2 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -58,14 +58,16 @@ installPhase() { mkdir $i/lib/vdpau mv $i/lib/libvdpau* $i/lib/vdpau - # Install ICDs. - install -Dm644 nvidia.icd $i/etc/OpenCL/vendors/nvidia.icd + # Install ICDs, make absolute paths. + sed -E "s#(libnvidia-opencl)#$i/lib/\\1#" nvidia.icd > nvidia.icd.fixed + install -Dm644 nvidia.icd.fixed $i/etc/OpenCL/vendors/nvidia.icd if [ -e nvidia_icd.json.template ]; then - sed "s#__NV_VK_ICD__#libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json + sed "s#__NV_VK_ICD__#$i/lib/libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json install -Dm644 nvidia_icd.json $i/share/vulkan/icd.d/nvidia.json fi if [ "$useGLVND" = "1" ]; then - install -Dm644 10_nvidia.json $i/share/glvnd/egl_vendor.d/nvidia.json + sed -E "s#(libEGL_nvidia)#$i/lib/\\1#" 10_nvidia.json > 10_nvidia.json.fixed + install -Dm644 10_nvidia.json.fixed $i/share/glvnd/egl_vendor.d/nvidia.json fi done -- cgit 1.4.1 From 1a5d2e29c5b6cfaa159db926cd3def3bb62635b9 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Thu, 13 Jun 2019 09:13:49 +0200 Subject: gtk3: re-enable demos --- pkgs/development/libraries/gtk+/3.x.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 30b33c7aea97..b0c6d073d171 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -53,8 +53,9 @@ stdenv.mkDerivation rec { ++ optional cupsSupport cups; #TODO: colord? - # demos fail to install, no idea where's the problem - preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; + ## (2019-06-12) Demos seem to install fine now. Keeping this around in case it fails again. + ## (2014-03-27) demos fail to install, no idea where's the problem + #preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; enableParallelBuilding = true; -- cgit 1.4.1 From 213be075d1dbe99a17e4e352ba0c18b161832471 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sat, 15 Jun 2019 18:52:00 +0200 Subject: libelf: Add patch to prevent -Wundef warnings. The Linux kernel includes libelf headers with -Wundef and -Werror enabled, resulting in an error when the headers are found through -I as opposed to -isystem. Fixes https://github.com/NixOS/nixpkgs/issues/59929 --- pkgs/development/libraries/libelf/default.nix | 3 + .../libraries/libelf/preprocessor-warnings.patch | 264 +++++++++++++++++++++ 2 files changed, 267 insertions(+) create mode 100644 pkgs/development/libraries/libelf/preprocessor-warnings.patch diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 55a01c75dcf2..5105bf7e73f0 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { patches = [ ./dont-hardcode-ar.patch + # Fix warnings from preprocessor instructions. + # https://github.com/NixOS/nixpkgs/issues/59929 + ./preprocessor-warnings.patch ]; doCheck = true; diff --git a/pkgs/development/libraries/libelf/preprocessor-warnings.patch b/pkgs/development/libraries/libelf/preprocessor-warnings.patch new file mode 100644 index 000000000000..e04c8ee202a0 --- /dev/null +++ b/pkgs/development/libraries/libelf/preprocessor-warnings.patch @@ -0,0 +1,264 @@ +diff --git a/lib/elf_repl.h b/lib/elf_repl.h +index c5cf90f..7e1e8df 100644 +--- a/lib/elf_repl.h ++++ b/lib/elf_repl.h +@@ -45,7 +45,7 @@ typedef __libelf_u32_t Elf32_Word; + #define ELF32_FSZ_SWORD 4 + #define ELF32_FSZ_WORD 4 + +-#if __LIBELF64 ++#if defined(__LIBELF64) + + typedef __libelf_u64_t Elf64_Addr; + typedef __libelf_u16_t Elf64_Half; +@@ -93,7 +93,7 @@ typedef struct { + Elf32_Half e_shstrndx; + } Elf32_Ehdr; + +-#if __LIBELF64 ++#if defined(__LIBELF64) + typedef struct { + unsigned char e_ident[EI_NIDENT]; + Elf64_Half e_type; +@@ -307,7 +307,7 @@ typedef struct { + Elf32_Word sh_entsize; + } Elf32_Shdr; + +-#if __LIBELF64 ++#if defined(__LIBELF64) + typedef struct { + Elf64_Word sh_name; + Elf64_Word sh_type; +@@ -434,7 +434,7 @@ typedef struct { + Elf32_Half st_shndx; + } Elf32_Sym; + +-#if __LIBELF64 ++#if defined(__LIBELF64) + typedef struct { + Elf64_Word st_name; + unsigned char st_info; +@@ -457,7 +457,7 @@ typedef struct { + #define ELF32_ST_TYPE(i) ((i)&0xf) + #define ELF32_ST_INFO(b,t) (((b)<<4)+((t)&0xf)) + +-#if __LIBELF64 ++#if defined(__LIBELF64) + #define ELF64_ST_BIND(i) ((i)>>4) + #define ELF64_ST_TYPE(i) ((i)&0xf) + #define ELF64_ST_INFO(b,t) (((b)<<4)+((t)&0xf)) +@@ -495,7 +495,7 @@ typedef struct { + * Macros for manipulating st_other + */ + #define ELF32_ST_VISIBILITY(o) ((o)&0x3) +-#if __LIBELF64 ++#if defined(__LIBELF64) + #define ELF64_ST_VISIBILITY(o) ((o)&0x3) + #endif /* __LIBELF64 */ + +@@ -521,7 +521,7 @@ typedef struct { + Elf32_Sword r_addend; + } Elf32_Rela; + +-#if __LIBELF64 ++#if defined(__LIBELF64) + typedef struct { + Elf64_Addr r_offset; + Elf64_Xword r_info; +@@ -541,7 +541,7 @@ typedef struct { + #define ELF32_R_TYPE(i) ((unsigned char)(i)) + #define ELF32_R_INFO(s,t) (((s)<<8)+(unsigned char)(t)) + +-#if __LIBELF64 ++#if defined(__LIBELF64) + #define ELF64_R_SYM(i) ((Elf64_Xword)(i)>>32) + #define ELF64_R_TYPE(i) ((i)&0xffffffffL) + #define ELF64_R_INFO(s,t) (((Elf64_Xword)(s)<<32)+((t)&0xffffffffL)) +@@ -556,7 +556,7 @@ typedef struct { + Elf32_Word n_type; /* descriptor type */ + } Elf32_Nhdr; + +-#if __LIBELF64 ++#if defined(__LIBELF64) + /* Solaris and GNU use this layout. Be compatible. */ + /* XXX: Latest ELF specs say it's 64-bit!!! */ + typedef struct { +@@ -587,7 +587,7 @@ typedef struct { + Elf32_Word p_align; + } Elf32_Phdr; + +-#if __LIBELF64 ++#if defined(__LIBELF64) + typedef struct { + Elf64_Word p_type; + Elf64_Word p_flags; +@@ -654,7 +654,7 @@ typedef struct { + } d_un; + } Elf32_Dyn; + +-#if __LIBELF64 ++#if defined(__LIBELF64) + typedef struct { + Elf64_Sxword d_tag; + union { +@@ -798,7 +798,7 @@ typedef struct { + Elf32_Half si_flags; + } Elf32_Syminfo; + +-#if __LIBELF64 ++#if defined(__LIBELF64) + typedef struct { + Elf64_Half si_boundto; + Elf64_Half si_flags; +@@ -863,7 +863,7 @@ typedef struct { + + typedef Elf32_Half Elf32_Versym; + +-#if __LIBELF64 ++#if defined(__LIBELF64) + + typedef struct { + Elf64_Half vd_version; +@@ -933,7 +933,7 @@ typedef Elf64_Half Elf64_Versym; + /* + * Move section + */ +-#if __LIBELF64 ++#if defined(__LIBELF64) + + typedef struct { + Elf32_Lword m_value; +@@ -973,7 +973,7 @@ typedef struct { + } c_un; + } Elf32_Cap; + +-#if __LIBELF64 ++#if defined(__LIBELF64) + + typedef struct { + Elf64_Xword c_tag; +diff --git a/lib/gelf.h b/lib/gelf.h +index 5af0558..98a759c 100644 +--- a/lib/gelf.h ++++ b/lib/gelf.h +@@ -22,15 +22,15 @@ + #ifndef _GELF_H + #define _GELF_H + +-#if __LIBELF_INTERNAL__ ++#if defined(__LIBELF_INTERNAL__) + #include + #else /* __LIBELF_INTERNAL__ */ + #include + #endif /* __LIBELF_INTERNAL__ */ + +-#if __LIBELF_NEED_LINK_H ++#if defined(__LIBELF_NEED_LINK_H) + #include +-#elif __LIBELF_NEED_SYS_LINK_H ++#elif defined(__LIBELF_NEED_SYS_LINK_H) + #include + #endif /* __LIBELF_NEED_LINK_H */ + +@@ -46,7 +46,7 @@ extern "C" { + # endif /* __STDC__ || defined(__cplusplus) */ + #endif /* __P */ + +-#if !__LIBELF64 ++#if !defined(__LIBELF64) + + #error "GElf is not supported on this system." + +@@ -71,7 +71,7 @@ typedef Elf64_Sym GElf_Sym; + /* + * Symbol versioning + */ +-#if __LIBELF_SYMBOL_VERSIONS ++#if defined(__LIBELF_SYMBOL_VERSIONS) + typedef Elf64_Verdef GElf_Verdef; + typedef Elf64_Verneed GElf_Verneed; + typedef Elf64_Verdaux GElf_Verdaux; +diff --git a/lib/libelf.h b/lib/libelf.h +index 3ebd0f3..788482d 100644 +--- a/lib/libelf.h ++++ b/lib/libelf.h +@@ -25,7 +25,7 @@ + #include /* for size_t */ + #include + +-#if __LIBELF_INTERNAL__ ++#if defined(__LIBELF_INTERNAL__) + #include + #else /* __LIBELF_INTERNAL__ */ + #include +@@ -224,7 +224,7 @@ extern Elf_Data *elf32_xlatetom __P((Elf_Data *__dst, const Elf_Data *__src, + */ + extern long elf32_checksum __P((Elf *__elf)); + +-#if __LIBELF64 ++#if defined(__LIBELF64) + /* + * 64-bit ELF functions + * Not available on all platforms +diff --git a/lib/sys_elf.h.in b/lib/sys_elf.h.in +index b71a20d..722051b 100644 +--- a/lib/sys_elf.h.in ++++ b/lib/sys_elf.h.in +@@ -68,7 +68,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + #ifdef __LIBELF_HEADER_ELF_H + # include __LIBELF_HEADER_ELF_H + #else /* __LIBELF_HEADER_ELF_H */ +-# if __LIBELF_INTERNAL__ ++# if defined(__LIBELF_INTERNAL__) + # include + # else /* __LIBELF_INTERNAL__ */ + # include +@@ -92,7 +92,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + # define STN_UNDEF 0 + # endif /* STN_UNDEF */ + +-# if __LIBELF64 ++# if defined(__LIBELF64) + + # ifndef ELF64_FSZ_ADDR + # define ELF64_FSZ_ADDR 8 +@@ -116,7 +116,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + # define ELF64_R_INFO(s,t) (((Elf64_Xword)(s)<<32)+((t)&0xffffffffL)) + # endif /* ELF64_R_SYM */ + +-# if __LIBELF64_LINUX ++# if defined(__LIBELF64_LINUX) + typedef __libelf_u64_t Elf64_Addr; + typedef __libelf_u16_t Elf64_Half; + typedef __libelf_u64_t Elf64_Off; +diff --git a/lib/sys_elf.h.w32 b/lib/sys_elf.h.w32 +index 0f93c55..7360104 100644 +--- a/lib/sys_elf.h.w32 ++++ b/lib/sys_elf.h.w32 +@@ -68,7 +68,7 @@ + #ifdef __LIBELF_HEADER_ELF_H + # include __LIBELF_HEADER_ELF_H + #else /* __LIBELF_HEADER_ELF_H */ +-# if __LIBELF_INTERNAL__ ++# if defined(__LIBELF_INTERNAL__) + # include + # else /* __LIBELF_INTERNAL__ */ + # include +@@ -92,7 +92,7 @@ + # define STN_UNDEF 0 + # endif /* STN_UNDEF */ + +-# if __LIBELF64 ++# if defined(__LIBELF64) + + # ifndef ELF64_FSZ_ADDR + # define ELF64_FSZ_ADDR 8 +@@ -116,7 +116,7 @@ + # define ELF64_R_INFO(s,t) (((Elf64_Xword)(s)<<32)+((t)&0xffffffffL)) + # endif /* ELF64_R_SYM */ + +-# if __LIBELF64_LINUX ++# if defined(__LIBELF64_LINUX) + typedef __libelf_u64_t Elf64_Addr; + typedef __libelf_u16_t Elf64_Half; + typedef __libelf_u64_t Elf64_Off; -- cgit 1.4.1 From 8679773d637254ad089ae1e89647dfc4dfa3852b Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 16 Jun 2019 15:53:18 +0300 Subject: pythonPackages.pysmf: init at 0.1.1 --- pkgs/development/python-modules/pysmf/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/pysmf/default.nix diff --git a/pkgs/development/python-modules/pysmf/default.nix b/pkgs/development/python-modules/pysmf/default.nix new file mode 100644 index 000000000000..ef5e560b08c7 --- /dev/null +++ b/pkgs/development/python-modules/pysmf/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest }: + +buildPythonPackage rec { + pname = "pysmf"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "10i7vvvdx6c3gl4afsgnpdanwgzzag087zs0fxvfipnqknazj806"; + }; + + nativeBuildInputs = [ pkg-config pytest ]; + buildInputs = [ libsmf glib ]; + + meta = with stdenv.lib; { + homepage = "http://das.nasophon.de/pysmf/"; + description = "Python extension module for reading and writing Standard MIDI Files, based on libsmf."; + license = licenses.bsd2; + maintainers = [ maintainers.gnidorah ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 828cf517d5c8..4e08541c0448 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -807,6 +807,8 @@ in { slurm = pkgs.slurm; }; + pysmf = callPackage ../development/python-modules/pysmf { }; + pyspinel = callPackage ../development/python-modules/pyspinel {}; pyssim = callPackage ../development/python-modules/pyssim { }; -- cgit 1.4.1 From de8ad1f55b0b5871f12d46d035902c45a982e4e3 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 16 Jun 2019 15:57:36 +0300 Subject: mididings: init at 20151117 --- pkgs/tools/audio/mididings/default.nix | 38 ++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/audio/mididings/default.nix diff --git a/pkgs/tools/audio/mididings/default.nix b/pkgs/tools/audio/mididings/default.nix new file mode 100644 index 000000000000..fb3d0e51341c --- /dev/null +++ b/pkgs/tools/audio/mididings/default.nix @@ -0,0 +1,38 @@ +{ stdenv, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2 }: + +pythonPackages.buildPythonApplication rec { + version = "20151117"; + pname = "mididings"; + + src = fetchFromGitHub { + owner = "dsacre"; + repo = "mididings"; + rev = "bbec99a8c878a2a7029e78e84fc736e4a68ed5a0"; + sha256 = "1pdf5mib87zy7yjh9vpasja419h28wvgq6x5hw2hkm7bg9ds4p2m"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ glib alsaLib libjack2 pythonPackages.boost ]; + propagatedBuildInputs = with pythonPackages; [ decorator ] + # for livedings + ++ [ tkinter pyliblo ] + # for mididings.extra + ++ [ dbus-python pyinotify ] + # to read/write standard MIDI files + ++ [ pysmf ] + # so mididings knows where to look for config files + ++ [ pyxdg ]; + + preBuild = with stdenv.lib.versions; '' + substituteInPlace setup.py \ + --replace boost_python "boost_python${major pythonPackages.python.version}${minor pythonPackages.python.version}" + ''; + + meta = with stdenv.lib; { + description = "A MIDI router and processor based on Python, supporting ALSA and JACK MIDI"; + homepage = "http://das.nasophon.de/mididings"; + license = licenses.gpl2; + maintainers = [ maintainers.gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 889684d3fa94..754745bae851 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1695,6 +1695,8 @@ in metabase = callPackage ../servers/metabase { }; + mididings = callPackage ../tools/audio/mididings { }; + miniserve = callPackage ../tools/misc/miniserve { }; mkspiffs = callPackage ../tools/filesystems/mkspiffs { }; -- cgit 1.4.1 From 105d8b89e4aa146fd3bf95c19c3c1da0689d188f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 17:19:34 -0700 Subject: glib-networking: 2.60.2 -> 2.60.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/glib-networking/versions --- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index a51183e4e11a..4f853e9821ff 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -3,14 +3,14 @@ let pname = "glib-networking"; - version = "2.60.2"; + version = "2.60.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0cl74q7hvq4xqqc88vlzmfw1sh5n9hdh1yvn2v1vg9am1z8z68n0"; + sha256 = "1mfw44qpmwvz6yzj8c6spx6z357wrmkk15byrkc5byagd82860fm"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs -- cgit 1.4.1 From b063dc8557e207a70a648a8904a0691478e2ccaf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 18:03:24 -0700 Subject: gpgme: 1.13.0 -> 1.13.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gpgme/versions --- pkgs/development/libraries/gpgme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index fc7634128dc0..c462f2e685a2 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { name = "gpgme-${version}"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "0c6676g0yhfsmy32i1dgwh5cx0ja8vhcqf4k08zad177m53kxcnl"; + sha256 = "0imyjfryvvjdbai454p70zcr95m94j9xnzywrlilqdw2fqi0pqy4"; }; outputs = [ "out" "dev" "info" ]; -- cgit 1.4.1 From 2cc2ccdec1d9b5f8af0e9785f034847ebe08749d Mon Sep 17 00:00:00 2001 From: Daniël de Kok Date: Mon, 17 Jun 2019 14:16:17 +0200 Subject: pyo3-pack: 0.5.0 -> 0.6.1 Changes: - Basic PyPy support. - Removes Python 2 support. - Removes custom progress bar. https://github.com/PyO3/pyo3-pack/releases/tag/v0.6.0 --- pkgs/development/tools/rust/pyo3-pack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/pyo3-pack/default.nix b/pkgs/development/tools/rust/pyo3-pack/default.nix index 91d25fe68071..a17d50262a0e 100644 --- a/pkgs/development/tools/rust/pyo3-pack/default.nix +++ b/pkgs/development/tools/rust/pyo3-pack/default.nix @@ -5,16 +5,16 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "pyo3-pack-${version}"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "PyO3"; repo = "pyo3-pack"; rev = "v${version}"; - sha256 = "0577v8nqjbb7l7fqvac706bg9zrcp8fbh9ca1mkj44db12v02kgb"; + sha256 = "0zk0jhr7lnl9z6c8pbk7si3wa8b1kqzj3wrslc1n5fjla7xx8fzn"; }; - cargoSha256 = "1prwgkgvg11cbpx086irrafg59mfvnykadagcp3qgyry6d82blsv"; + cargoSha256 = "13gycipxc17baxg8nvjzkw96i1pxgncx7qjcrm9aab7p9vi2vrih"; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From 8de795e22f026a75fceecd1792ced68cbf046e45 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 Mar 2019 20:08:00 +0100 Subject: meson: 0.49.1 → 0.50.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/build-managers/meson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 638fd2eaa43f..b5ee5d758170 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -11,12 +11,12 @@ let }; in python3Packages.buildPythonApplication rec { - version = "0.49.2"; pname = "meson"; + version = "0.50.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0ckkzq0kbnnk4rwv20lggm9a4fb5054jbv99i9pwjhid23qy7059"; + sha256 = "05k3wsxjcnnq7a8n5kzxh2cdh5jdkh13xagigz5axs48j36zfai4"; }; postFixup = '' -- cgit 1.4.1 From da5fc5c985a77c40bec34c027202132e46a0e81e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Jun 2019 12:01:31 +0200 Subject: release-small.nix: Don't depend on currentSystem --- nixos/release-small.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release-small.nix b/nixos/release-small.nix index b5b09dc38d06..84af457801a1 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -11,7 +11,7 @@ let nixpkgsSrc = nixpkgs; # urgh - pkgs = import ./.. {}; + pkgs = import ./.. { system = "x86_64-linux"; }; lib = pkgs.lib; -- cgit 1.4.1 From 7eb332af5d6e4ed76030f84d68bb62eaca7fdac2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Jun 2019 12:12:42 +0200 Subject: Remove default value for nixpkgs.system Using "builtins.currentSystem" doesn't work in pure evaluation mode, and even when it's explicitly set (which it always is, in nixos/lib/eval-config.nix), it breaks manual generation because the manual tries to render the default value. --- nixos/modules/misc/nixpkgs.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 9d19dd2a7ff2..e0c192246c0c 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -196,7 +196,6 @@ in system = mkOption { type = types.str; example = "i686-linux"; - default = { system = builtins.currentSystem; }; description = '' Specifies the Nix platform type on which NixOS should be built. It is better to specify nixpkgs.localSystem instead. -- cgit 1.4.1 From 4e08e8ef30a7070885ef69fe4fc3cea36b15abe0 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Wed, 19 Jun 2019 23:55:12 -0400 Subject: gitkraken: 5.0.4 -> 6.0.0 - Add at_spi2_atk dependency - Add libuuid dependency --- pkgs/applications/version-management/gitkraken/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 8b807d11e34a..4720701613dd 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -2,7 +2,7 @@ , libXfixes, atk, gtk3, libXrender, pango, gnome2, gnome3, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus -, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme +, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme, at_spi2_atk, libuuid }: with stdenv.lib; @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "5.0.4"; + version = "6.0.0"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "1fq0w8djkcx5jr2pw6izlq5rkwbq3r3f15xr3dmmbz6gjvi3nra0"; + sha256 = "1ykjdnzl34pqr6dhfnswix44i412c7gcba1pk95a8670wmc29a1f"; }; libPath = makeLibraryPath [ @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { gnome2.GConf libgnome-keyring openssl + at_spi2_atk + libuuid ]; desktopItem = makeDesktopItem { -- cgit 1.4.1 From 6b799f218e6e5e6b6b53a3430363f3a4706644ff Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Thu, 20 Jun 2019 00:52:02 -0400 Subject: Use at-spi2-atk instead of at_spi2_atk --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 4720701613dd..12d22e2cc3ca 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -2,7 +2,7 @@ , libXfixes, atk, gtk3, libXrender, pango, gnome2, gnome3, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus -, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme, at_spi2_atk, libuuid +, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme, at-spi2-atk, libuuid }: with stdenv.lib; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { gnome2.GConf libgnome-keyring openssl - at_spi2_atk + at-spi2-atk libuuid ]; -- cgit 1.4.1 From b3cc65f8b9b1c0e40c76af4293f6a1aa30cde96a Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 20 Jun 2019 13:07:56 +0000 Subject: buildPerlPackage: name -> (pname, version) --- pkgs/applications/graphics/gscan2pdf/default.nix | 4 +- pkgs/applications/misc/get_iplayer/default.nix | 2 +- .../perl-modules/BerkeleyDB/default.nix | 7 +- .../perl-modules/Compress-Raw-Zlib/default.nix | 7 +- .../perl-modules/DBD-Oracle/default.nix | 7 +- pkgs/development/perl-modules/DBD-Pg/default.nix | 7 +- .../perl-modules/DBD-SQLite/default.nix | 5 +- .../development/perl-modules/DBD-mysql/default.nix | 5 +- .../perl-modules/DBD-sybase/default.nix | 7 +- pkgs/development/perl-modules/DB_File/default.nix | 7 +- pkgs/development/perl-modules/MNI/default.nix | 5 +- pkgs/development/perl-modules/generic/default.nix | 14 +- pkgs/development/perl-modules/maatkit/default.nix | 7 +- pkgs/development/tools/analysis/egypt/default.nix | 4 +- pkgs/development/tools/misc/ninka/default.nix | 2 +- pkgs/development/web/wml/default.nix | 5 +- pkgs/servers/foswiki/default.nix | 4 +- pkgs/servers/mail/postfix/pflogsumm.nix | 4 +- pkgs/servers/mail/spamassassin/default.nix | 5 +- .../monitoring/fusion-inventory/default.nix | 2 +- pkgs/servers/openxpki/default.nix | 3 +- pkgs/servers/slimserver/default.nix | 2 +- pkgs/tools/backup/znapzend/default.nix | 10 +- pkgs/tools/filesystems/file-rename/default.nix | 7 +- pkgs/tools/graphics/feedgnuplot/default.nix | 2 +- pkgs/tools/graphics/graph-easy/default.nix | 6 +- pkgs/tools/misc/rename/default.nix | 2 +- pkgs/tools/misc/shelldap/default.nix | 2 +- pkgs/tools/networking/ddclient/default.nix | 4 +- pkgs/tools/system/awstats/default.nix | 4 +- pkgs/tools/typesetting/biber/default.nix | 4 +- pkgs/tools/typesetting/tex/texlive/bin.nix | 3 +- pkgs/tools/virtualization/linode-cli/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 7365 ++++++++++++-------- 34 files changed, 4470 insertions(+), 3056 deletions(-) diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 191aefbe7efc..7ecee8d6d631 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; perlPackages.buildPerlPackage rec { - name = "gscan2pdf-${version}"; + pname = "gscan2pdf"; version = "2.3.0"; src = fetchurl { - url = "mirror://sourceforge/gscan2pdf/${version}/${name}.tar.xz"; + url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; sha256 = "0mcsmly0j9pmyzh6py8r6sfa30hc6gv300hqq3dxj4hv653vhkk9"; }; diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 5e8bb629ce2a..baf2f5165d6d 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; perlPackages.buildPerlPackage rec { - name = "get_iplayer-${version}"; + pname = "get_iplayer"; version = "2.99"; src = fetchFromGitHub { diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix index db94a3b07fe2..b23db8e1edfe 100644 --- a/pkgs/development/perl-modules/BerkeleyDB/default.nix +++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix @@ -1,10 +1,11 @@ {buildPerlPackage, fetchurl, db}: -buildPerlPackage rec { - name = "BerkeleyDB-0.61"; +buildPerlPackage { + pname = "BerkeleyDB"; + version = "0.61"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; + url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.61.tar.gz"; sha256 = "0l65v301cz6a9dxcw6a4ps2mnr5zq358yn81favap6i092krggiz"; }; diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 7c733742d2b0..1163b6cb15b3 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -1,10 +1,11 @@ { fetchurl, buildPerlPackage, zlib, stdenv }: -buildPerlPackage rec { - name = "Compress-Raw-Zlib-2.086"; +buildPerlPackage { + pname = "Compress-Raw-Zlib"; + version = "2.086"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.086.tar.gz; sha256 = "0va93wc968p4l2ql0k349bz189l2vbs09bpn865cvc36amqxwv9z"; }; diff --git a/pkgs/development/perl-modules/DBD-Oracle/default.nix b/pkgs/development/perl-modules/DBD-Oracle/default.nix index 9db926bf94da..a7ec1e2d1826 100644 --- a/pkgs/development/perl-modules/DBD-Oracle/default.nix +++ b/pkgs/development/perl-modules/DBD-Oracle/default.nix @@ -1,10 +1,11 @@ { fetchurl, buildPerlPackage, DBI, TestNoWarnings, oracle-instantclient }: -buildPerlPackage rec { - name = "DBD-Oracle-1.76"; +buildPerlPackage { + pname = "DBD-Oracle"; + version = "1.76"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZA/ZARQUON/${name}.tar.gz"; + url = mirror://cpan/authors/id/Z/ZA/ZARQUON/DBD-Oracle-1.76.tar.gz; sha256 = "b6db7f43c6252179274cfe99c1950b93e248f8f0fe35b07e50388c85d814d5f3"; }; diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix index f6b31aafaf65..339791215385 100644 --- a/pkgs/development/perl-modules/DBD-Pg/default.nix +++ b/pkgs/development/perl-modules/DBD-Pg/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, buildPerlPackage, DBI, postgresql }: -buildPerlPackage rec { - name = "DBD-Pg-3.7.4"; +buildPerlPackage { + pname = "DBD-Pg"; + version = "3.7.4"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TU/TURNSTEP/${name}.tar.gz"; + url = "mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.7.4.tar.gz"; sha256 = "0gkqlvbmzbdm0g4k328nlkjdg3wrjm5i2n9jxj1i8sqxkm79rylz"; }; diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index ff84de40b30e..5a24687c2b01 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, buildPerlPackage, perl, DBI, sqlite }: -buildPerlPackage rec { - name = "DBD-SQLite-1.62"; +buildPerlPackage { + pname = "DBD-SQLite"; + version = "1.62"; src = fetchurl { url = mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.62.tar.gz; diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index 5365e0c6b95b..54df32f3eb20 100644 --- a/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -1,10 +1,11 @@ { fetchurl, buildPerlPackage, DBI, DevelChecklib, mysql }: buildPerlPackage rec { - name = "DBD-mysql-4.050"; + pname = "DBD-mysql"; + version = "4.050"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DV/DVEEDEN/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DV/DVEEDEN/DBD-mysql-4.050.tar.gz; sha256 = "0y4djb048i09dk19av7mzfb3khr72vw11p3ayw2p82jsy4gm8j2g"; }; diff --git a/pkgs/development/perl-modules/DBD-sybase/default.nix b/pkgs/development/perl-modules/DBD-sybase/default.nix index ced458396da5..e863663fc947 100644 --- a/pkgs/development/perl-modules/DBD-sybase/default.nix +++ b/pkgs/development/perl-modules/DBD-sybase/default.nix @@ -1,10 +1,11 @@ { fetchurl, buildPerlPackage, DBI, freetds }: -buildPerlPackage rec { - name = "DBD-Sybase-1.16"; +buildPerlPackage { + pname = "DBD-Sybase"; + version = "1.16"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ME/MEWP/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/ME/MEWP/DBD-Sybase-1.16.tar.gz; sha256 = "1k6n261nrrcll9wxn5xwi4ibpavqv1il96687k62mbpznzl2gx37"; }; diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix index d37fb1f12daf..d63e3a487276 100644 --- a/pkgs/development/perl-modules/DB_File/default.nix +++ b/pkgs/development/perl-modules/DB_File/default.nix @@ -1,10 +1,11 @@ {fetchurl, buildPerlPackage, db}: -buildPerlPackage rec { - name = "DB_File-1.851"; +buildPerlPackage { + pname = "DB_File"; + version = "1.851"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; + url = "mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.851.tar.gz"; sha256 = "1j276mng1nwxxdxnb3my427s5lb6zlnssizcnxricnvaa170kdv8"; }; diff --git a/pkgs/development/perl-modules/MNI/default.nix b/pkgs/development/perl-modules/MNI/default.nix index dbb167e27b32..def32abf881c 100644 --- a/pkgs/development/perl-modules/MNI/default.nix +++ b/pkgs/development/perl-modules/MNI/default.nix @@ -1,7 +1,8 @@ { fetchFromGitHub, buildPerlPackage, stdenv }: -buildPerlPackage rec { - name = "MNI-Perllib-2012-04-13"; +buildPerlPackage { + pname = "MNI-Perllib"; + version = "2012-04-13"; src = fetchFromGitHub { owner = "BIC-MNI"; diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index 3a28c50be39a..073b0f1c5ad3 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -1,7 +1,14 @@ { lib, stdenv, perl, buildPerl, toPerlModule }: -{ buildInputs ? [], nativeBuildInputs ? [], name, ... } @ attrs: +{ buildInputs ? [], nativeBuildInputs ? [], ... } @ attrs: +assert attrs?pname -> attrs?version; +assert attrs?pname -> !(attrs?name); + +(if attrs ? name then + lib.trivial.warn "builtPerlPackage: `name' (\"${attrs.name}\") is deprecated, use `pname' and `version' instead" + else + (x: x)) toPerlModule(stdenv.mkDerivation ( ( lib.recursiveUpdate @@ -27,14 +34,15 @@ toPerlModule(stdenv.mkDerivation ( # https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0/pod/perldelta.pod#Removal-of-the-current-directory-%28%22.%22%29-from-@INC PERL_USE_UNSAFE_INC = "1"; - meta.homepage = "https://metacpan.org/release/${(builtins.parseDrvName name).name}"; + meta.homepage = "https://metacpan.org/release/${attrs.pname or (builtins.parseDrvName attrs.name).name}"; # TODO: phase-out `attrs.name` meta.platforms = perl.meta.platforms; } attrs ) // { - name = "perl${perl.version}-${name}"; + pname = "perl${perl.version}-${attrs.pname or (builtins.parseDrvName attrs.name).name}"; # TODO: phase-out `attrs.name` + version = attrs.version or (builtins.parseDrvName attrs.name).version; # TODO: phase-out `attrs.name` builder = ./builder.sh; buildInputs = buildInputs ++ [ perl ]; nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ]; diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/pkgs/development/perl-modules/maatkit/default.nix index fabb3824129c..b23b7afa7a30 100644 --- a/pkgs/development/perl-modules/maatkit/default.nix +++ b/pkgs/development/perl-modules/maatkit/default.nix @@ -1,10 +1,11 @@ {buildPerlPackage, stdenv, fetchurl, DBDmysql}: -buildPerlPackage rec { - name = "maatkit-7540"; +buildPerlPackage { + pname = "maatkit"; + version = "7540"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/maatkit/${name}.tar.gz"; + url = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/maatkit/maatkit-7540.tar.gz; sha256 = "1a7rxrddkrsfxb2wj01ha91ld0vapfkqcy8j9p08l76zz2l8p2v1"; }; diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix index 7db46005f453..6259756794df 100644 --- a/pkgs/development/tools/analysis/egypt/default.nix +++ b/pkgs/development/tools/analysis/egypt/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { - name = "egypt-${version}"; + pname = "egypt"; version = "1.10"; src = fetchurl { sha256 = "0r0wj6v8z9fzlh9pb5617kyjdf92ppmlbzajaarrq729bbb6ln5m"; - url = "https://www.gson.org/egypt/download/${name}.tar.gz"; + url = "https://www.gson.org/egypt/download/${pname}-${version}.tar.gz"; }; outputs = [ "out" ]; diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index df793866cbb8..af3b45a8e62c 100644 --- a/pkgs/development/tools/misc/ninka/default.nix +++ b/pkgs/development/tools/misc/ninka/default.nix @@ -3,7 +3,7 @@ assert stdenv ? glibc; perlPackages.buildPerlPackage rec { - name = "ninka-${version}"; + pname = "ninka"; version = "2.0-pre"; src = fetchFromGitHub { diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix index 44ce36b76ddc..82faf32a3210 100644 --- a/pkgs/development/web/wml/default.nix +++ b/pkgs/development/web/wml/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, perlPackages, ncurses, lynx, makeWrapper }: perlPackages.buildPerlPackage rec { - name = "wml-2.0.11"; + pname = "wml"; + version = "2.0.11"; src = fetchurl { - url = "http://thewml.org/distrib/${name}.tar.gz"; + url = "http://thewml.org/distrib/wml-2.0.11.tar.gz"; sha256 = "0jjxpq91x7y2mgixz7ghqp01m24qa37wl3zz515rrzv7x8cyy4cf"; }; diff --git a/pkgs/servers/foswiki/default.nix b/pkgs/servers/foswiki/default.nix index 572d1736755b..67d460809e15 100644 --- a/pkgs/servers/foswiki/default.nix +++ b/pkgs/servers/foswiki/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { - name = "foswiki-${version}"; + pname = "foswiki"; version = "2.1.0"; src = fetchurl { @@ -17,7 +17,7 @@ perlPackages.buildPerlPackage rec { EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree IOSocketSSL JSON LocaleMaketextLexicon LocaleMsgfmt - LWP URI perlPackages.version + LWP URI perlPackages.Version /*# optional dependencies libapreq2 DBI DBDmysql DBDPg DBDSQLite FCGI FCGIProcManager CryptSMIME CryptX509 ConvertPEM diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix index 821999380606..8f85bc5f6d6d 100644 --- a/pkgs/servers/mail/postfix/pflogsumm.nix +++ b/pkgs/servers/mail/postfix/pflogsumm.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { - name = "pflogsumm-${version}"; + pname = "pflogsumm"; version = "1.1.3"; src = fetchurl { - url = "https://jimsun.linxnet.com/downloads/${name}.tar.gz"; + url = "https://jimsun.linxnet.com/downloads/${pname}-${version}.tar.gz"; sha256 = "0hkim9s5f1yg5sfs5048jydhy3sbxafls496wcjk0cggxb113py4"; }; diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index e95fcaa03ef1..186f4670153f 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, perlPackages, makeWrapper, gnupg }: perlPackages.buildPerlPackage rec { - name = "SpamAssassin-3.4.2"; + pname = "SpamAssassin"; + version = "3.4.2"; src = fetchurl { - url = "mirror://apache/spamassassin/source/Mail-${name}.tar.bz2"; + url = "mirror://apache/spamassassin/source/Mail-${pname}-${version}.tar.bz2"; sha256 = "1np8h293bzg33i0xn9gj9krwgr7k6xbyf1yhxr2j2xci95d080yg"; }; diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index 33725cb62839..27e3cfdab9d1 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -3,7 +3,7 @@ }: perlPackages.buildPerlPackage rec { - name = "FusionInventory-Agent-${version}"; + pname = "FusionInventory-Agent"; version = "2.3.21"; src = fetchFromGitHub { diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index 192951607bfa..05ee7f343523 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -3,7 +3,8 @@ , extraDependencies1 ? false, extraDependencies2 ? false, extraDependencies3 ? false }: perlPackages.buildPerlPackage { - name = "openxpki-git20150807"; + pname = "openxpki"; + version = "git20150807"; src = fetchgit { url = "https://github.com/openxpki/openxpki"; diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index 90c84ce15879..d755f864d4e3 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -2,7 +2,7 @@ , perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }: perlPackages.buildPerlPackage rec { - name = "slimserver-${version}"; + pname = "slimserver"; version = "7.9.1"; src = fetchurl { diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index 5314eef9eb6a..05792ecbb128 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -3,16 +3,18 @@ let # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/PERL_MODULES Mojolicious-6-46 = perlPackages.buildPerlPackage rec { - name = "Mojolicious-6.46"; + pname = "Mojolicious"; + version = "6.46"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; + url = "mirror://cpan/authors/id/S/SR/SRI/${pname}-${version}.tar.gz"; sha256 = "0i3axmx4506fx5gms148pj65x6ys7flaz1aqjd8hd9zfkd8pzdfr"; }; }; MojoIOLoopForkCall-0-17 = perlPackages.buildPerlModule rec { - name = "Mojo-IOLoop-ForkCall-0.17"; + pname = "Mojo-IOLoop-ForkCall"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JB/JBERGER/${name}.tar.gz"; + url = "mirror://cpan/authors/id/J/JB/JBERGER/${pname}-${version}.tar.gz"; sha256 = "090qxz1nbah2qxvfg4whl6yp6q03qkx7a42751iai521nk1yavc8"; }; propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-6-46 ]; diff --git a/pkgs/tools/filesystems/file-rename/default.nix b/pkgs/tools/filesystems/file-rename/default.nix index 8dc4ec534a2b..8eeb052b22f0 100644 --- a/pkgs/tools/filesystems/file-rename/default.nix +++ b/pkgs/tools/filesystems/file-rename/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, perlPackages, makeWrapper }: -perlPackages.buildPerlPackage rec { - name = "File-Rename-0.20"; +perlPackages.buildPerlPackage { + pname = "File-Rename"; + version = "0.20"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RM/RMBARKER/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RM/RMBARKER/File-Rename-0.20.tar.gz; sha256 = "1cf6xx2hiy1xalp35fh8g73j67r0w0g66jpcbc6971x9jbm7bvjy"; }; diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index 4ff769eadf54..8f94624febe8 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -9,7 +9,7 @@ let in perlPackages.buildPerlPackage rec { - name = "feedgnuplot-${version}"; + pname = "feedgnuplot"; version = "1.51"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix index 63d3e60e2069..009a86094ec5 100644 --- a/pkgs/tools/graphics/graph-easy/default.nix +++ b/pkgs/tools/graphics/graph-easy/default.nix @@ -1,10 +1,10 @@ { stdenv, perlPackages, fetchurl }: -perlPackages.buildPerlPackage rec { - name = "Graph-Easy-${version}"; +perlPackages.buildPerlPackage { + pname = "Graph-Easy"; version = "0.76"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Graph-Easy-0.76.tar.gz"; sha256 = "d4a2c10aebef663b598ea37f3aa3e3b752acf1fbbb961232c3dbe1155008d1fa"; }; diff --git a/pkgs/tools/misc/rename/default.nix b/pkgs/tools/misc/rename/default.nix index 89f76bb9b1b1..a2087902c93b 100644 --- a/pkgs/tools/misc/rename/default.nix +++ b/pkgs/tools/misc/rename/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perlPackages }: perlPackages.buildPerlPackage rec { - name = "rename-${version}"; + pname = "rename"; version = "1.9"; outputs = [ "out" ]; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/shelldap/default.nix b/pkgs/tools/misc/shelldap/default.nix index 9686955e1dd0..89257c8ffc46 100644 --- a/pkgs/tools/misc/shelldap/default.nix +++ b/pkgs/tools/misc/shelldap/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { - name = "shelldap-${version}"; + pname = "shelldap"; version = "1.4.0"; src = fetchurl { url = "https://bitbucket.org/mahlon/shelldap/downloads/shelldap-${version}.tar.gz"; diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 517a70466441..6efba72b1dcf 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perlPackages, iproute, perl }: perlPackages.buildPerlPackage rec { - name = "ddclient-${version}"; + pname = "ddclient"; version = "3.9.0"; src = fetchurl { - url = "mirror://sourceforge/ddclient/${name}.tar.gz"; + url = "mirror://sourceforge/ddclient/${pname}-${version}.tar.gz"; sha256 = "0fwyhab8yga2yi1kdfkbqxa83wxhwpagmj1w1mwkg2iffh1fjjlw"; }; diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix index 9686ec5d715c..6d191f33a64d 100644 --- a/pkgs/tools/system/awstats/default.nix +++ b/pkgs/tools/system/awstats/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perlPackages, jdk }: perlPackages.buildPerlPackage rec { - name = "awstats-${version}"; + pname = "awstats"; version = "7.7"; src = fetchurl { - url = "mirror://sourceforge/awstats/${name}.tar.gz"; + url = "mirror://sourceforge/awstats/${pname}-${version}.tar.gz"; sha256 = "0z3p77jnpjilajs9yv87r8xla2x1gjqlvrhpbgbh5ih73386v3j2"; }; diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index 03e4a5223b3a..3f9ba73e13d9 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -4,8 +4,8 @@ let biberSource = stdenv.lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs); in -perlPackages.buildPerlModule rec { - name = "biber-${version}"; +perlPackages.buildPerlModule { + pname = "biber"; inherit (biberSource) version; src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz"; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 6122fcdba3f2..5aab4c80d275 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -285,7 +285,8 @@ dvipng = stdenv.mkDerivation { latexindent = perlPackages.buildPerlPackage rec { - inherit (src) name version; + pname = "latexindent"; + inherit (src) version; src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.latexindent.pkgs); diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index c4fb74cf1a1d..d7696be85e40 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perlPackages, makeWrapper}: perlPackages.buildPerlPackage rec { - name = "linode-cli-${version}"; + pname = "linode-cli"; version = "1.4.7"; src = fetchFromGitHub { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aaca6ddc333b..cf4d9fc77f69 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -69,10 +69,11 @@ let makeFullPerlPath = deps: makePerlPath (stdenv.lib.misc.closePropagation deps); - ack = buildPerlPackage rec { - name = "ack-2.28"; + ack = buildPerlPackage { + pname = "ack"; + version = "2.28"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/ack-2.28.tar.gz; sha256 = "16zgn96v1qkibpj5lic571zjl07y8x55v5xql3x7bvlsmgqcnvla"; }; outputs = ["out" "man"]; @@ -90,7 +91,8 @@ let }; AlgorithmAnnotate = buildPerlPackage { - name = "Algorithm-Annotate-0.10"; + pname = "Algorithm-Annotate"; + version = "0.10"; src = fetchurl { url = mirror://cpan/authors/id/C/CL/CLKAO/Algorithm-Annotate-0.10.tar.gz; sha256 = "1y92k4nqkscfwpriv8q7c90rjfj85lvwq1k96niv2glk8d37dcf9"; @@ -98,10 +100,11 @@ let propagatedBuildInputs = [ AlgorithmDiff ]; }; - AlgorithmC3 = buildPerlPackage rec { - name = "Algorithm-C3-0.10"; + AlgorithmC3 = buildPerlPackage { + pname = "Algorithm-C3"; + version = "0.10"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; + url = mirror://cpan/authors/id/H/HA/HAARG/Algorithm-C3-0.10.tar.gz; sha256 = "01hlcaxndls86bl92rkd3fvf9pfa3inxqaimv88bxs95803kmkss"; }; meta = { @@ -110,17 +113,19 @@ let }; }; - AlgorithmDiff = let version = "1.1903"; in buildPerlPackage { - name = "Algorithm-Diff-${version}"; + AlgorithmDiff = buildPerlPackage { + pname = "Algorithm-Diff"; + version = "1.1903"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TY/TYEMQ/Algorithm-Diff-${version}.tar.gz"; + url = mirror://cpan/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1903.tar.gz; sha256 = "0l8pk7ziz72d022hsn4xldhhb9f5649j5cgpjdibch0xng24ms1h"; }; buildInputs = [ pkgs.unzip ]; }; - AlgorithmMerge = buildPerlPackage rec { - name = "Algorithm-Merge-0.08"; + AlgorithmMerge = buildPerlPackage { + pname = "Algorithm-Merge"; + version = "0.08"; src = fetchurl { url = mirror://cpan/authors/id/J/JS/JSMITH/Algorithm-Merge-0.08.tar.gz; sha256 = "1kqn13wd0lfjrf6h19b9kgdqqwp7k2d9yfq5i0wvii0xi8jqh1lw"; @@ -129,7 +134,8 @@ let }; AlienBuild = buildPerlPackage { - name = "Alien-Build-1.65"; + pname = "Alien-Build"; + version = "1.65"; src = fetchurl { url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.65.tar.gz; sha256 = "1xvwh6r2aawilpxl8zdqb8yy3skj56nkps3h5xz6spkv4ggzzm4a"; @@ -143,7 +149,8 @@ let }; AlienGMP = buildPerlPackage { - name = "Alien-GMP-1.14"; + pname = "Alien-GMP"; + version = "1.14"; src = fetchurl { url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-GMP-1.14.tar.gz; sha256 = "116vvh1b0d1ykkklqgfxfn89g3bw90a4cj3qrvsnkw1kk5cmn60a"; @@ -156,17 +163,19 @@ let }; }; - aliased = buildPerlModule rec { - name = "aliased-0.34"; + aliased = buildPerlModule { + pname = "aliased"; + version = "0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/aliased-0.34.tar.gz; sha256 = "1syyqzy462501kn5ma9gl6xbmcahqcn4qpafhsmpz0nd0x2m4l63"; }; buildInputs = [ ModuleBuildTiny ]; }; - asa = buildPerlPackage rec { - name = "asa-1.03"; + asa = buildPerlPackage { + pname = "asa"; + version = "1.03"; src = fetchurl { url = mirror://cpan/authors/id/A/AD/ADAMK/asa-1.03.tar.gz; sha256 = "1w97m0gf3n9av61d0qcw7d1i1rac4gm0fd2ba5wyh53df9d7p0i2"; @@ -177,11 +186,11 @@ let }; }; - AlienTidyp = buildPerlModule rec { - name = "Alien-Tidyp-${version}"; + AlienTidyp = buildPerlModule { + pname = "Alien-Tidyp"; version = "1.4.7"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KM/KMX/Alien-Tidyp-v${version}.tar.gz"; + url = mirror://cpan/authors/id/K/KM/KMX/Alien-Tidyp-v1.4.7.tar.gz; sha256 = "0raapwp4155lqag1kzhsd20z4if10hav9wx4d7mc1xpvf7dcnr5r"; }; @@ -190,20 +199,22 @@ let propagatedBuildInputs = [ FileShareDir ]; }; - AlienWxWidgets = buildPerlModule rec { - name = "Alien-wxWidgets-0.69"; + AlienWxWidgets = buildPerlModule { + pname = "Alien-wxWidgets"; + version = "0.69"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-0.69.tar.gz; sha256 = "0jg2dmkzhj03f6b0vmv597yryfw9cclsdn9ynvvlrzzgpd5lw8jk"; }; propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK30 ModulePluggable ]; buildInputs = [ LWPProtocolHttps ]; }; - AnyEvent = buildPerlPackage rec { - name = "AnyEvent-7.15"; + AnyEvent = buildPerlPackage { + pname = "AnyEvent"; + version = "7.15"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.15.tar.gz; sha256 = "111db2335c71f789edaec271126b3810356691eb1214dd3f67b527a88ec9e354"; }; buildInputs = [ CanaryStability ]; @@ -212,10 +223,11 @@ let }; }; - AnyEventCacheDNS = buildPerlModule rec { - name = "AnyEvent-CacheDNS-0.08"; + AnyEventCacheDNS = buildPerlModule { + pname = "AnyEvent-CacheDNS"; + version = "0.08"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PO/POTYL/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PO/POTYL/AnyEvent-CacheDNS-0.08.tar.gz; sha256 = "41c1faf183b61806b55889ceea1237750c1f61b9ce2735fdf33dc05536712dae"; }; propagatedBuildInputs = [ AnyEvent ]; @@ -227,19 +239,21 @@ let }; }; - AnyEventHTTP = buildPerlPackage rec { - name = "AnyEvent-HTTP-2.24"; + AnyEventHTTP = buildPerlPackage { + pname = "AnyEvent-HTTP"; + version = "2.24"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-HTTP-2.24.tar.gz; sha256 = "0358a542baa45403d81c0a70e43e79c044ddfa1371161d043f002acef63121dd"; }; propagatedBuildInputs = [ AnyEvent commonsense ]; }; - AnyEventI3 = buildPerlPackage rec { - name = "AnyEvent-I3-0.17"; + AnyEventI3 = buildPerlPackage { + pname = "AnyEvent-I3"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MS/MSTPLBG/AnyEvent-I3-0.17.tar.gz; sha256 = "5382c984c9f138395f29f0c00af81aa0c8f4b765582055c73ede4b13f04a6d63"; }; propagatedBuildInputs = [ AnyEvent JSONXS ]; @@ -249,10 +263,11 @@ let }; }; - AnyEventRabbitMQ = buildPerlPackage rec { - name = "AnyEvent-RabbitMQ-1.19"; + AnyEventRabbitMQ = buildPerlPackage { + pname = "AnyEvent-RabbitMQ"; + version = "1.19"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DL/DLAMBLEY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DL/DLAMBLEY/AnyEvent-RabbitMQ-1.19.tar.gz; sha256 = "a440ec2fa5a4018ad44739baaa9601cc460ad497282e89110ba8e3cf23312f0a"; }; buildInputs = [ TestException ]; @@ -263,19 +278,21 @@ let }; }; - AnyMoose = buildPerlPackage rec { - name = "Any-Moose-0.27"; + AnyMoose = buildPerlPackage { + pname = "Any-Moose"; + version = "0.27"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/Any-Moose-0.27.tar.gz; sha256 = "0dc55mpayrixwx8dwql0vj0jalg4rlb3k64rprc84bl0z8vkx9m8"; }; propagatedBuildInputs = [ Moose Mouse ]; }; - ApacheAuthCookie = buildPerlPackage rec { - name = "Apache-AuthCookie-3.27"; + ApacheAuthCookie = buildPerlPackage { + pname = "Apache-AuthCookie"; + version = "3.27"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHOUT/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.27.tar.gz; sha256 = "58daeb3e44c681ff88f8fb00e4aabaa7a40cbee73dbdb84fcf6c285b15d357bd"; }; buildInputs = [ ApacheTest ]; @@ -292,10 +309,11 @@ let }; }; - ApacheLogFormatCompiler = buildPerlModule rec { - name = "Apache-LogFormat-Compiler-0.35"; + ApacheLogFormatCompiler = buildPerlModule { + pname = "Apache-LogFormat-Compiler"; + version = "0.35"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KA/KAZEBURO/Apache-LogFormat-Compiler-0.35.tar.gz; sha256 = "06i70ydxk2wa2rcqn16842kra2qz3jwk0vk1abq8lah4180c0m0n"; }; buildInputs = [ HTTPMessage ModuleBuildTiny TestMockTime TestRequires TryTiny URI ]; @@ -310,7 +328,8 @@ let }; ApacheSession = buildPerlModule { - name = "Apache-Session-1.93"; + pname = "Apache-Session"; + version = "1.93"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHORNY/Apache-Session-1.93.tar.gz; sha256 = "8e5a4882ac8ec657d1018d74d3ba37854e2688a41ddd0e1d73955ea59f276e8d"; @@ -323,7 +342,8 @@ let }; ApacheTest = buildPerlPackage { - name = "Apache-Test-1.40"; + pname = "Apache-Test"; + version = "1.40"; src = fetchurl { url = mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.40.tar.gz; sha256 = "0h5fsi0is6nhclsd3wwkkqx2hfgl3bpdazxycafm9sqxr3qkgx9w"; @@ -336,7 +356,8 @@ let }; AppCLI = buildPerlPackage { - name = "App-CLI-0.50"; + pname = "App-CLI"; + version = "0.50"; src = fetchurl { url = mirror://cpan/authors/id/P/PT/PTC/App-CLI-0.50.tar.gz; sha256 = "0ick5agl02rx2pjfxl97d0f9qksy8pjn0asmwm3gn6dm7a1zblsi"; @@ -345,10 +366,11 @@ let buildInputs = [ TestKwalitee TestPod ]; }; - AppCmd = buildPerlPackage rec { - name = "App-Cmd-0.331"; + AppCmd = buildPerlPackage { + pname = "App-Cmd"; + version = "0.331"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.331.tar.gz; sha256 = "4a5d3df0006bd278880d01f4957aaa652a8f91fe8f66e93adf70fba0c3ecb680"; }; buildInputs = [ TestFatal ]; @@ -360,10 +382,11 @@ let }; }; - AppConfig = buildPerlPackage rec { - name = "AppConfig-1.71"; + AppConfig = buildPerlPackage { + pname = "AppConfig"; + version = "1.71"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NE/NEILB/AppConfig-1.71.tar.gz; sha256 = "03vvi3mk4833mx2c6dkm9zhvakf02mb2b7wz9pk9xc7c4mq04xqi"; }; meta = { @@ -372,8 +395,9 @@ let buildInputs = [ TestPod ]; }; - AppFatPacker = buildPerlPackage rec { - name = "App-FatPacker-0.010008"; + AppFatPacker = buildPerlPackage { + pname = "App-FatPacker"; + version = "0.010008"; src = fetchurl { url = mirror://cpan/authors/id/M/MS/MSTROUT/App-FatPacker-0.010008.tar.gz; sha256 = "1kzcbpsf1p7ww45d9fl2w0nfn5jj5pz0r0c649c1lrj5r1nv778j"; @@ -384,10 +408,11 @@ let }; }; - Appcpanminus = buildPerlPackage rec { - name = "App-cpanminus-1.7044"; + Appcpanminus = buildPerlPackage { + pname = "App-cpanminus"; + version = "1.7044"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz; sha256 = "9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3"; }; meta = { @@ -397,10 +422,11 @@ let }; }; - Appperlbrew = buildPerlModule rec { - name = "App-perlbrew-0.86"; + Appperlbrew = buildPerlModule { + pname = "App-perlbrew"; + version = "0.86"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GU/GUGOD/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.86.tar.gz; sha256 = "11qh94am7fghizmjaf5c7w868svjbv9g4ffirykj8qa6q40zdspp"; }; buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; @@ -418,8 +444,9 @@ let }; }; - ArchiveAnyLite = buildPerlPackage rec { - name = "Archive-Any-Lite-0.11"; + ArchiveAnyLite = buildPerlPackage { + pname = "Archive-Any-Lite"; + version = "0.11"; src = fetchurl { url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Archive-Any-Lite-0.11.tar.gz; sha256 = "0w2i50fd81ip674zmnrb15nadw162fdpiw4rampbd94k74jqih8m"; @@ -432,11 +459,11 @@ let }; }; - AppSqitch = buildPerlModule rec { + AppSqitch = buildPerlModule { version = "0.9999"; - name = "App-Sqitch-${version}"; + pname = "App-Sqitch"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-0.9999.tar.gz; sha256 = "f5bfa80206738ab8a70358a3b0557661c7459e11ec07dece23ecafa1f34372b3"; }; buildInputs = [ CaptureTiny IOPager TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings TestWarn ]; @@ -449,8 +476,9 @@ let }; }; - AppSt = buildPerlPackage rec { - name = "App-St-1.1.4"; + AppSt = buildPerlPackage { + pname = "App-St"; + version = "1.1.4"; src = fetchurl { url = https://github.com/nferraz/st/archive/v1.1.4.tar.gz; sha256 = "1f4bqm4jiazcxgzzja1i48671za96621k0s3ln87cdacgvv1can0"; @@ -468,7 +496,8 @@ let }; AttributeParamsValidate = buildPerlPackage { - name = "Attribute-Params-Validate-1.21"; + pname = "Attribute-Params-Validate"; + version = "1.21"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/Attribute-Params-Validate-1.21.tar.gz; sha256 = "586b939ceffdb37188b7c461dd1a8f9f35695184c8703b05c35f6d508c8090f5"; @@ -482,8 +511,9 @@ let }; }; - ArrayCompare = buildPerlModule rec { - name = "Array-Compare-3.0.2"; + ArrayCompare = buildPerlModule { + pname = "Array-Compare"; + version = "3.0.2"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.2.tar.gz; sha256 = "0ci8pb6nh73rmmwd8fvg6n2064v8nbraqyg1axsncfi28nfz522s"; @@ -493,8 +523,9 @@ let propagatedBuildInputs = [ Moo TypeTiny ]; }; - ArrayDiff = buildPerlPackage rec { - name = "Array-Diff-0.07"; + ArrayDiff = buildPerlPackage { + pname = "Array-Diff"; + version = "0.07"; src = fetchurl { url = mirror://cpan/authors/id/T/TY/TYPESTER/Array-Diff-0.07.tar.gz; sha256 = "0il3izx45wkh71fli2hvaq32jyin95k8x3qrnwby2x2c6yix7rvq"; @@ -506,10 +537,11 @@ let }; }; - ArrayFIFO = buildPerlPackage rec { - name = "Array-FIFO-0.13"; + ArrayFIFO = buildPerlPackage { + pname = "Array-FIFO"; + version = "0.13"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DB/DBURKE/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DB/DBURKE/Array-FIFO-0.13.tar.gz; sha256 = "be2aeb5f5a9af1a96f0033508a569ca93ad19ad15dc7c6b998e6d7bc740c66f7"; }; buildInputs = [ TestDeep TestSpec TestTrap ]; @@ -521,10 +553,11 @@ let }; }; - ArchiveCpio = buildPerlPackage rec { - name = "Archive-Cpio-0.10"; + ArchiveCpio = buildPerlPackage { + pname = "Archive-Cpio"; + version = "0.10"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PI/PIXEL/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PI/PIXEL/Archive-Cpio-0.10.tar.gz; sha256 = "246fb31669764e78336b2191134122e07c44f2d82dc4f37d552ab28f8668bed3"; }; meta = { @@ -534,10 +567,11 @@ let }; }; - ArchiveExtract = buildPerlPackage rec { - name = "Archive-Extract-0.80"; + ArchiveExtract = buildPerlPackage { + pname = "Archive-Extract"; + version = "0.80"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Archive-Extract-0.80.tar.gz; sha256 = "25cbc2d5626c14d39a0b5e4fe8383941e085c9a7e0aa873d86e81b6e709025f4"; }; meta = { @@ -546,10 +580,11 @@ let }; }; - ArchiveTar = buildPerlPackage rec { - name = "Archive-Tar-2.32"; + ArchiveTar = buildPerlPackage { + pname = "Archive-Tar"; + version = "2.32"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.32.tar.gz; sha256 = "92783780731ab0c9247adf43e70f4801e8317e3915ea87e38b85c8f734e8fca2"; }; meta = { @@ -558,8 +593,9 @@ let }; }; - ArchiveTarWrapper = buildPerlPackage rec { - name = "Archive-Tar-Wrapper-0.36"; + ArchiveTarWrapper = buildPerlPackage { + pname = "Archive-Tar-Wrapper"; + version = "0.36"; src = fetchurl { url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.36.tar.gz; sha256 = "1s7i93qbimwygv07x5963vv90m09g2iiacnl3986smw4rpi5apwg"; @@ -572,7 +608,8 @@ let }; ArchiveZip = buildPerlPackage { - name = "Archive-Zip-1.64"; + pname = "Archive-Zip"; + version = "1.64"; src = fetchurl { url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.64.tar.gz; sha256 = "0zfinh8nx3rxzscp57vq3w8hihpdb0zs67vvalykcf402kr88pyy"; @@ -584,10 +621,11 @@ let }; }; - AudioScan = buildPerlPackage rec { - name = "Audio-Scan-1.01"; + AudioScan = buildPerlPackage { + pname = "Audio-Scan"; + version = "1.01"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AG/AGRUNDMA/Audio-Scan-1.01.tar.gz; sha256 = "0jk3djnk6yf0jsjh8qk3mj8bkx4avp6i4czcpr5xrbf7f41744l3"; }; buildInputs = [ pkgs.zlib TestWarn ]; @@ -599,10 +637,11 @@ let }; }; - AuthenDecHpwd = buildPerlModule rec { - name = "Authen-DecHpwd-2.007"; + AuthenDecHpwd = buildPerlModule { + pname = "Authen-DecHpwd"; + version = "2.007"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-DecHpwd-2.007.tar.gz; sha256 = "f43a93bb02b41f7327d92f9e963b69505f67350a52e8f50796f98afc4fb3f177"; }; propagatedBuildInputs = [ DataInteger DigestCRC ScalarString ]; @@ -612,8 +651,9 @@ let }; }; - AuthenHtpasswd = buildPerlPackage rec { - name = "Authen-Htpasswd-0.171"; + AuthenHtpasswd = buildPerlPackage { + pname = "Authen-Htpasswd"; + version = "0.171"; src = fetchurl { url = mirror://cpan/authors/id/M/MS/MSTROUT/Authen-Htpasswd-0.171.tar.gz; sha256 = "0rw06hwpxg388d26l0jvirczx304f768ijvc20l4b2ll7xzg9ymm"; @@ -625,10 +665,11 @@ let }; }; - AuthenModAuthPubTkt = buildPerlPackage rec { - name = "Authen-ModAuthPubTkt-0.1.1"; + AuthenModAuthPubTkt = buildPerlPackage { + pname = "Authen-ModAuthPubTkt"; + version = "0.1.1"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AG/AGORDON/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AG/AGORDON/Authen-ModAuthPubTkt-0.1.1.tar.gz; sha256 = "7996e1a42c51216003ccf03c4b5250286b4c55684257971851f5ece9161dc7dd"; }; propagatedBuildInputs = [ pkgs.openssl IPCRun3 ]; @@ -641,10 +682,11 @@ let }; }; - AuthenPassphrase = buildPerlModule rec { - name = "Authen-Passphrase-0.008"; + AuthenPassphrase = buildPerlModule { + pname = "Authen-Passphrase"; + version = "0.008"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-Passphrase-0.008.tar.gz; sha256 = "55db4520617d859d88c0ee54965da815b7226d792b8cdc8debf92073559e0463"; }; propagatedBuildInputs = [ AuthenDecHpwd CryptDES CryptEksblowfish CryptMySQL CryptPasswdMD5 CryptUnixCryptXS DataEntropy DigestMD4 ModuleRuntime ]; @@ -654,8 +696,9 @@ let }; }; - AuthenRadius = buildPerlPackage rec { - name = "Authen-Radius-0.29"; + AuthenRadius = buildPerlPackage { + pname = "Authen-Radius"; + version = "0.29"; src = fetchurl { url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.29.tar.gz; sha256 = "7fb3425546b2f518e4a07edb3bcb55672454fe8e13bece58de2dc43885afb079"; @@ -668,10 +711,11 @@ let }; }; - AuthenSASL = buildPerlPackage rec { - name = "Authen-SASL-2.16"; + AuthenSASL = buildPerlPackage { + pname = "Authen-SASL"; + version = "2.16"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GB/GBARR/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GB/GBARR/Authen-SASL-2.16.tar.gz; sha256 = "02afhlrdq5hh5g8b32fa79fqq5i76qzwfqqvfi9zi57h31szl536"; }; propagatedBuildInputs = [ DigestHMAC ]; @@ -681,10 +725,11 @@ let }; }; - AuthenSimple = buildPerlPackage rec { - name = "Authen-Simple-0.5"; + AuthenSimple = buildPerlPackage { + pname = "Authen-Simple"; + version = "0.5"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHANSEN/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-0.5.tar.gz; sha256 = "02cddab47f8bf1a1cbd4c9bf8d258f6d05111499c33f8315e7244812f72613aa"; }; propagatedBuildInputs = [ ClassAccessor ClassDataInheritable CryptPasswdMD5 ParamsValidate ]; @@ -694,8 +739,9 @@ let }; }; - AuthenSimplePasswd = buildPerlModule rec { - name = "Authen-Simple-Passwd-0.6"; + AuthenSimplePasswd = buildPerlModule { + pname = "Authen-Simple-Passwd"; + version = "0.6"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-Passwd-0.6.tar.gz; sha256 = "1ckl2ry9r5nb1rcn1ik2l5b5pp1i3g4bmllsmzb0zpwy4lvbqmfg"; @@ -707,8 +753,9 @@ let }; }; - autobox = buildPerlPackage rec { - name = "autobox-3.0.1"; + autobox = buildPerlPackage { + pname = "autobox"; + version = "3.0.1"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-v3.0.1.tar.gz; sha256 = "c303b7fccfaa1ff4d4c429ab3f15e5ca2a77554ef8c9fc3b8c62ba859e874c98"; @@ -721,10 +768,11 @@ let buildInputs = [ IPCSystemSimple TestFatal ]; }; - Autodia = buildPerlPackage rec { - name = "Autodia-2.14"; + Autodia = buildPerlPackage { + pname = "Autodia"; + version = "2.14"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TE/TEEJAY/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TE/TEEJAY/Autodia-2.14.tar.gz; sha256 = "08pl5y18nsvy8ihfzdsbd8rz6a8al09wqfna07zdjfdyib42b0dc"; }; propagatedBuildInputs = [ TemplateToolkit XMLSimple ]; @@ -750,10 +798,11 @@ let buildInputs = [ DBI ]; }; - autovivification = buildPerlPackage rec { - name = "autovivification-0.18"; + autovivification = buildPerlPackage { + pname = "autovivification"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz"; + url = mirror://cpan/authors/id/V/VP/VPIT/autovivification-0.18.tar.gz; sha256 = "01giacr2sx6b9bgfz6aqw7ndcnf08j8n6kwhm7880a94hmb9g69d"; }; meta = { @@ -762,10 +811,11 @@ let }; }; - BC = buildPerlPackage rec { - name = "B-C-1.55"; + BC = buildPerlPackage { + pname = "B-C"; + version = "1.55"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RU/RURBAN/B-C-1.55.tar.gz; sha256 = "001bc3mxv1zkg1ynqpv3fbn1v3h3bqihg0pp19z4gfvrsrkns8q9"; }; propagatedBuildInputs = [ BFlags IPCRun Opcodes ]; @@ -777,10 +827,11 @@ let doCheck = false; /* test fails */ }; - BFlags = buildPerlPackage rec { - name = "B-Flags-0.17"; + BFlags = buildPerlPackage { + pname = "B-Flags"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RU/RURBAN/B-Flags-0.17.tar.gz; sha256 = "1chhgkaw2h3qniz71dykynggqp0r6b6mi2f4nh4x3ghm2g89gny1"; }; meta = { @@ -790,10 +841,11 @@ let BerkeleyDB = callPackage ../development/perl-modules/BerkeleyDB { }; - BHooksEndOfScope = buildPerlPackage rec { - name = "B-Hooks-EndOfScope-0.24"; + BHooksEndOfScope = buildPerlPackage { + pname = "B-Hooks-EndOfScope"; + version = "0.24"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.24.tar.gz; sha256 = "1imcqxp23yc80a7p0h56sja9glbrh4qyhgzljqd4g9habpz3vah3"; }; propagatedBuildInputs = [ ModuleImplementation SubExporterProgressive ]; @@ -804,7 +856,8 @@ let }; BHooksOPCheck = buildPerlPackage { - name = "B-Hooks-OP-Check-0.22"; + pname = "B-Hooks-OP-Check"; + version = "0.22"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-OP-Check-0.22.tar.gz; sha256 = "1kfdv25gn6yik8jrwik4ajp99gi44s6idcvyyrzhiycyynzd3df7"; @@ -816,10 +869,11 @@ let }; }; - bignum = buildPerlPackage rec { - name = "bignum-0.51"; + bignum = buildPerlPackage { + pname = "bignum"; + version = "0.51"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PJ/PJACKLAM/bignum-0.51.tar.gz; sha256 = "8ac0f6efe0b6f24804690e53908bdc5346613667f1c0590d8cf808ec090e9c47"; }; meta = { @@ -830,7 +884,8 @@ let }; BitVector = buildPerlPackage { - name = "Bit-Vector-7.4"; + pname = "Bit-Vector"; + version = "7.4"; src = fetchurl { url = mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-7.4.tar.gz; sha256 = "09m96p8c0ipgz42li2ywdgy0vxb57mb5nf59j9gw7yzc3xkslv9w"; @@ -838,10 +893,11 @@ let propagatedBuildInputs = [ CarpClan ]; }; - BKeywords = buildPerlPackage rec { - name = "B-Keywords-1.20"; + BKeywords = buildPerlPackage { + pname = "B-Keywords"; + version = "1.20"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.20.tar.gz; sha256 = "12jvx5gnypqxal4valkf9lidba9nz7kjk2wvm07q3hkmdqxw1zk0"; }; meta = { @@ -850,10 +906,11 @@ let }; }; - boolean = buildPerlPackage rec { - name = "boolean-0.46"; + boolean = buildPerlPackage { + pname = "boolean"; + version = "0.46"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; + url = mirror://cpan/authors/id/I/IN/INGY/boolean-0.46.tar.gz; sha256 = "95c088085c3e83bf680fe6ce16d8264ec26310490f7d1680e416ea7a118f156a"; }; meta = { @@ -863,10 +920,11 @@ let }; }; - BoostGeometryUtils = buildPerlModule rec { - name = "Boost-Geometry-Utils-0.15"; + BoostGeometryUtils = buildPerlModule { + pname = "Boost-Geometry-Utils"; + version = "0.15"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AA/AAR/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AA/AAR/Boost-Geometry-Utils-0.15.tar.gz; sha256 = "1jnihz3029x51a455nxa0jx2z125x38q3vkkggsgdlrvawzxsm00"; }; patches = [ @@ -877,8 +935,9 @@ let buildInputs = [ ExtUtilsCppGuess ExtUtilsTypemapsDefault ExtUtilsXSpp ModuleBuildWithXSpp ]; }; - BSDResource = buildPerlPackage rec { - name = "BSD-Resource-1.2911"; + BSDResource = buildPerlPackage { + pname = "BSD-Resource"; + version = "1.2911"; src = fetchurl { url = mirror://cpan/authors/id/J/JH/JHI/BSD-Resource-1.2911.tar.gz; sha256 = "0g8c7825ng2m0yz5sy6838rvfdl8j3vm29524wjgf66ccfhgn74x"; @@ -890,8 +949,9 @@ let }; }; - BUtils = buildPerlPackage rec { - name = "B-Utils-0.27"; + BUtils = buildPerlPackage { + pname = "B-Utils"; + version = "0.27"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/B-Utils-0.27.tar.gz; sha256 = "1spzhmk3z6c4blmra3kn84nq20fira2b3vjg86m0j085lgv56zzr"; @@ -904,8 +964,9 @@ let }; }; - BusinessHours = buildPerlPackage rec { - name = "Business-Hours-0.13"; + BusinessHours = buildPerlPackage { + pname = "Business-Hours"; + version = "0.13"; src = fetchurl { url = mirror://cpan/authors/id/B/BP/BPS/Business-Hours-0.13.tar.gz; sha256 = "1hiybixagj3i1hsnfr134jgs9wv4azkwq6kijr9zlkxqzczzw1x8"; @@ -916,10 +977,11 @@ let }; }; - BusinessISBN = buildPerlPackage rec { - name = "Business-ISBN-3.004"; + BusinessISBN = buildPerlPackage { + pname = "Business-ISBN"; + version = "3.004"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-3.004.tar.gz; sha256 = "07l3zfv8hagv37i3clvj5a1zc2jarr5phg80c93ks35zaz6llx9i"; }; propagatedBuildInputs = [ BusinessISBNData ]; @@ -929,10 +991,11 @@ let }; }; - BusinessISBNData = buildPerlPackage rec { - name = "Business-ISBN-Data-20140910.003"; + BusinessISBNData = buildPerlPackage { + pname = "Business-ISBN-Data"; + version = "20140910.003"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-Data-20140910.003.tar.gz; sha256 = "1jc5jrjwkr6pqga7998zkgw0yrxgb5n1y7lzgddawxibkf608mn7"; }; meta = { @@ -941,10 +1004,11 @@ let }; }; - BusinessISMN = buildPerlPackage rec { - name = "Business-ISMN-1.201"; + BusinessISMN = buildPerlPackage { + pname = "Business-ISMN"; + version = "1.201"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.201.tar.gz; sha256 = "1cpcfyaz1fl6fnm076jx2jsphw147wj6aszj2yzqrgsncjhk2cja"; }; propagatedBuildInputs = [ TieCycle ]; @@ -955,7 +1019,8 @@ let }; BusinessISSN = buildPerlPackage { - name = "Business-ISSN-1.003"; + pname = "Business-ISSN"; + version = "1.003"; src = fetchurl { url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.003.tar.gz; sha256 = "1272456c19937a24bc5f9a0db9dc447043591137719ee4dc955a63be544b99d1"; @@ -966,8 +1031,9 @@ let }; }; - CacheCache = buildPerlPackage rec { - name = "Cache-Cache-1.08"; + CacheCache = buildPerlPackage { + pname = "Cache-Cache"; + version = "1.08"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Cache-Cache-1.08.tar.gz; sha256 = "1s6i670dc3yb6ngvdk48y6szdk5n1f4icdcjv2vi1l2xp9fzviyj"; @@ -976,16 +1042,18 @@ let doCheck = false; # randomly fails }; - CacheFastMmap = buildPerlPackage rec { - name = "Cache-FastMmap-1.48"; + CacheFastMmap = buildPerlPackage { + pname = "Cache-FastMmap"; + version = "1.48"; src = fetchurl { url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.48.tar.gz; sha256 = "118y5lxwa092zrii7mcwnqypff7424w1dpgfkg8zlnz7h2mmnd9c"; }; }; - CacheMemcached = buildPerlPackage rec { - name = "Cache-Memcached-1.30"; + CacheMemcached = buildPerlPackage { + pname = "Cache-Memcached"; + version = "1.30"; src = fetchurl { url = mirror://cpan/authors/id/D/DO/DORMANDO/Cache-Memcached-1.30.tar.gz; @@ -995,7 +1063,8 @@ let }; CacheMemcachedFast = buildPerlPackage { - name = "Cache-Memcached-Fast-0.25"; + pname = "Cache-Memcached-Fast"; + version = "0.25"; src = fetchurl { url = mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.25.tar.gz; sha256 = "0ijw5hlzas1aprp3s6wzabch426m1d8cvp1wn9qphrn4jj82aakq"; @@ -1007,7 +1076,8 @@ let }; CacheMemory = buildPerlModule { - name = "Cache-2.11"; + pname = "Cache"; + version = "2.11"; src = fetchurl { url = mirror://cpan/authors/id/S/SH/SHLOMIF/Cache-2.11.tar.gz; sha256 = "14m513f4g02daklmnvdm7vqh3w3ick65wvmvqnmnc4cqfybdilp1"; @@ -1017,7 +1087,8 @@ let }; CacheSimpleTimedExpiry = buildPerlPackage { - name = "Cache-Simple-TimedExpiry-0.27"; + pname = "Cache-Simple-TimedExpiry"; + version = "0.27"; src = fetchurl { url = mirror://cpan/authors/id/J/JE/JESSE/Cache-Simple-TimedExpiry-0.27.tar.gz; sha256 = "4e78b7e4dd231b5571a48cd0ee1b63953f5e34790c9d020e1595a7c7d0abbe49"; @@ -1028,10 +1099,11 @@ let }; }; - Cairo = buildPerlPackage rec { - name = "Cairo-1.106"; + Cairo = buildPerlPackage { + pname = "Cairo"; + version = "1.106"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + url = mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.106.tar.gz; sha256 = "1i25kks408c54k2zxskvg54l5k3qadzm8n72ffga9jy7ic0h6j76"; }; buildInputs = [ pkgs.cairo ]; @@ -1043,10 +1115,11 @@ let propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ]; }; - CairoGObject = buildPerlPackage rec { - name = "Cairo-GObject-1.004"; + CairoGObject = buildPerlPackage { + pname = "Cairo-GObject"; + version = "1.004"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + url = mirror://cpan/authors/id/X/XA/XAOC/Cairo-GObject-1.004.tar.gz; sha256 = "1m896j0xdfhldsx8abf10cc16ll1fm9wbav42dpzal9fh07d9f9v"; }; buildInputs = [ pkgs.cairo ]; @@ -1057,17 +1130,19 @@ let propagatedBuildInputs = [ Cairo Glib ]; }; - cam_pdf = buildPerlModule rec { - name = "CAM-PDF-1.60"; + cam_pdf = buildPerlModule { + pname = "CAM-PDF"; + version = "1.60"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CD/CDOLAN/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CD/CDOLAN/CAM-PDF-1.60.tar.gz; sha256 = "12dv5ssf3y7yjz9mrrqnfzx8nf4ydk1qijf5fx59495671zzqsp7"; }; propagatedBuildInputs = [ CryptRC4 TextPDF ]; }; - capitalization = buildPerlPackage rec { - name = "capitalization-0.03"; + capitalization = buildPerlPackage { + pname = "capitalization"; + version = "0.03"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIYAGAWA/capitalization-0.03.tar.gz; sha256 = "0g7fpckydzxsf8mjkfbyj0pv42dzym4hwbizqahnh7wlfbaicdgi"; @@ -1077,10 +1152,11 @@ let }; }; - CanaryStability = buildPerlPackage rec { - name = "Canary-Stability-2012"; + CanaryStability = buildPerlPackage { + pname = "Canary-Stability"; + version = "2012"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Canary-Stability-2012.tar.gz; sha256 = "fd240b111d834dbae9630c59b42fae2145ca35addc1965ea311edf0d07817107"; }; meta = { @@ -1088,8 +1164,9 @@ let }; }; - CaptchaReCAPTCHA = buildPerlPackage rec { - name = "Captcha-reCaptcha-0.99"; + CaptchaReCAPTCHA = buildPerlPackage { + pname = "Captcha-reCaptcha"; + version = "0.99"; src = fetchurl { url = mirror://cpan/authors/id/S/SU/SUNNYP/Captcha-reCaptcha-0.99.tar.gz; sha256 = "14j3lk6fhfzda5d3d7z6f373ng3fzxazzwpjyziysrhic1v3b4mq"; @@ -1097,10 +1174,11 @@ let propagatedBuildInputs = [ HTMLTiny LWP ]; }; - CaptureTiny = buildPerlPackage rec { - name = "Capture-Tiny-0.48"; + CaptureTiny = buildPerlPackage { + pname = "Capture-Tiny"; + version = "0.48"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.48.tar.gz; sha256 = "069yrikrrb4vqzc3hrkkfj96apsh7q0hg8lhihq97lxshwz128vc"; }; meta = { @@ -1109,10 +1187,11 @@ let }; }; - CarpAlways = buildPerlPackage rec { - name = "Carp-Always-0.16"; + CarpAlways = buildPerlPackage { + pname = "Carp-Always"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FE/FERREIRA/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FE/FERREIRA/Carp-Always-0.16.tar.gz; sha256 = "1wb6b0qjga7kvn4p8df6k4g1pl2yzaqiln1713xidh3i454i3alq"; }; meta = { @@ -1123,7 +1202,8 @@ let }; CarpAssert = buildPerlPackage { - name = "Carp-Assert-0.21"; + pname = "Carp-Assert"; + version = "0.21"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEILB/Carp-Assert-0.21.tar.gz; sha256 = "0km5fc6r6whxh6h5yd7g1j0bi96sgk0gkda6cardicrw9qmqwkwj"; @@ -1133,7 +1213,8 @@ let }; CarpAssertMore = buildPerlPackage { - name = "Carp-Assert-More-1.16"; + pname = "Carp-Assert-More"; + version = "1.16"; src = fetchurl { url = mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.16.tar.gz; sha256 = "1x9jd6s3lq97na6gz7g0zaq62l8z297xsfpdj2v42p3ijpfirl4f"; @@ -1146,7 +1227,8 @@ let }; CarpClan = buildPerlPackage { - name = "Carp-Clan-6.07"; + pname = "Carp-Clan"; + version = "6.07"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Carp-Clan-6.07.tar.gz; sha256 = "0gaa4ygd9q8lp2fn5d9s7miiwxz92a2lqs7j6smwmifq6w3mc20a"; @@ -1157,10 +1239,11 @@ let }; }; - Carton = buildPerlPackage rec { - name = "Carton-v1.0.34"; + Carton = buildPerlPackage { + pname = "Carton"; + version = "1.0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Carton-v1.0.34.tar.gz; sha256 = "77d42b92732bcfc18a59d341e56ce476205b1c4d380eab3a07224f5745c23e45"; }; propagatedBuildInputs = [ ClassTiny MenloLegacy ModuleCPANfile PathTiny TryTiny ]; @@ -1171,10 +1254,11 @@ let }; }; - CatalystActionRenderView = buildPerlPackage rec { - name = "Catalyst-Action-RenderView-0.16"; + CatalystActionRenderView = buildPerlPackage { + pname = "Catalyst-Action-RenderView"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Action-RenderView-0.16.tar.gz; sha256 = "8565203950a057d43ecd64e9593715d565c2fbd8b02c91f43c53b2111acd3948"; }; propagatedBuildInputs = [ CatalystRuntime DataVisitor ]; @@ -1185,8 +1269,9 @@ let buildInputs = [ HTTPRequestAsCGI ]; }; - CatalystActionREST = buildPerlPackage rec { - name = "Catalyst-Action-REST-1.21"; + CatalystActionREST = buildPerlPackage { + pname = "Catalyst-Action-REST"; + version = "1.21"; src = fetchurl { url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Action-REST-1.21.tar.gz; sha256 = "ccf81bba5200d3a0ad6901f923af173a3d4416618aea08a6938baaffdef4cb20"; @@ -1200,7 +1285,8 @@ let }; CatalystAuthenticationCredentialHTTP = buildPerlModule { - name = "Catalyst-Authentication-Credential-HTTP-1.018"; + pname = "Catalyst-Authentication-Credential-HTTP"; + version = "1.018"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Authentication-Credential-HTTP-1.018.tar.gz; sha256 = "0ad5clfiyllnf37an99n139cxhhxf5g5rh8cxashsjv4xrnq38bg"; @@ -1213,8 +1299,9 @@ let }; }; - CatalystAuthenticationStoreHtpasswd = buildPerlModule rec { - name = "Catalyst-Authentication-Store-Htpasswd-1.006"; + CatalystAuthenticationStoreHtpasswd = buildPerlModule { + pname = "Catalyst-Authentication-Store-Htpasswd"; + version = "1.006"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Authentication-Store-Htpasswd-1.006.tar.gz; sha256 = "0kw0w2g1qmym896bgnqr1bfhvgb6xja39mv10701ipp8fmi8bzf7"; @@ -1224,7 +1311,8 @@ let }; CatalystAuthenticationStoreDBIxClass = buildPerlPackage { - name = "Catalyst-Authentication-Store-DBIx-Class-0.1506"; + pname = "Catalyst-Authentication-Store-DBIx-Class"; + version = "0.1506"; src = fetchurl { url = mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-DBIx-Class-0.1506.tar.gz; sha256 = "0i5ja7690fs9nhxcij6lw51j804sm8s06m5mvk1n8pi8jljrymvw"; @@ -1237,10 +1325,11 @@ let buildInputs = [ TestWarn ]; }; - CatalystComponentInstancePerContext = buildPerlPackage rec { - name = "Catalyst-Component-InstancePerContext-0.001001"; + CatalystComponentInstancePerContext = buildPerlPackage { + pname = "Catalyst-Component-InstancePerContext"; + version = "0.001001"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GR/GRODITI/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GR/GRODITI/Catalyst-Component-InstancePerContext-0.001001.tar.gz; sha256 = "7f63f930e1e613f15955c9e6d73873675c50c0a3bc2a61a034733361ed26d271"; }; propagatedBuildInputs = [ CatalystRuntime ]; @@ -1250,8 +1339,9 @@ let }; }; - CatalystControllerHTMLFormFu = buildPerlPackage rec { - name = "Catalyst-Controller-HTML-FormFu-2.04"; + CatalystControllerHTMLFormFu = buildPerlPackage { + pname = "Catalyst-Controller-HTML-FormFu"; + version = "2.04"; src = fetchurl { url = mirror://cpan/authors/id/N/NI/NIGELM/Catalyst-Controller-HTML-FormFu-2.04.tar.gz; sha256 = "f13fb9b3b3b00b35f06abc31614461c8d7346fbe07fb569c71e8d586e5eb5ddc"; @@ -1265,10 +1355,11 @@ let doCheck = false; /* fails with 'open3: exec of .. perl .. failed: Argument list too long at .../TAP/Parser/Iterator/Process.pm line 165.' */ }; - CatalystControllerPOD = buildPerlModule rec { - name = "Catalyst-Controller-POD-1.0.0"; + CatalystControllerPOD = buildPerlModule { + pname = "Catalyst-Controller-POD"; + version = "1.0.0"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PERLER/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PE/PERLER/Catalyst-Controller-POD-1.0.0.tar.gz; sha256 = "ee2a4bb3ed78baa1464335408f284345b6ba0ef6576ad7bfbd7b656c788a39f9"; }; buildInputs = [ ModuleInstall TestLongString TestWWWMechanize TestWWWMechanizeCatalyst ]; @@ -1279,10 +1370,11 @@ let }; }; - CatalystDevel = buildPerlPackage rec { - name = "Catalyst-Devel-1.39"; + CatalystDevel = buildPerlPackage { + pname = "Catalyst-Devel"; + version = "1.39"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; + url = mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Devel-1.39.tar.gz; sha256 = "bce371ba801c7d79eff3257e0af907cf62f140de968f0d63bf55be37d702a58a"; }; buildInputs = [ TestFatal ]; @@ -1294,10 +1386,11 @@ let }; }; - CatalystDispatchTypeRegex = buildPerlModule rec { - name = "Catalyst-DispatchType-Regex-5.90035"; + CatalystDispatchTypeRegex = buildPerlModule { + pname = "Catalyst-DispatchType-Regex"; + version = "5.90035"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MG/MGRIMES/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MG/MGRIMES/Catalyst-DispatchType-Regex-5.90035.tar.gz; sha256 = "06jq1lmpq88rmp9zik5gqczg234xac0hiyc3l698iif7zsgcyb80"; }; propagatedBuildInputs = [ CatalystRuntime ]; @@ -1307,10 +1400,11 @@ let }; }; - CatalystManual = buildPerlPackage rec { - name = "Catalyst-Manual-5.9009"; + CatalystManual = buildPerlPackage { + pname = "Catalyst-Manual"; + version = "5.9009"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Manual-5.9000.tar.gz; sha256 = "1z6l0vdjxzisqgb5w447m3m73sfvkhwm7qw2l1dpcdng3zaypllh"; }; meta = { @@ -1320,7 +1414,8 @@ let }; CatalystModelDBICSchema = buildPerlPackage { - name = "Catalyst-Model-DBIC-Schema-0.65"; + pname = "Catalyst-Model-DBIC-Schema"; + version = "0.65"; src = fetchurl { url = mirror://cpan/authors/id/G/GB/GBJK/Catalyst-Model-DBIC-Schema-0.65.tar.gz; sha256 = "26a911ef5ef7ffc81b6ce65c3156f71fb35083c456ad27e6d82d2dc02493eeea"; @@ -1333,8 +1428,9 @@ let }; }; - CatalystRuntime = buildPerlPackage rec { - name = "Catalyst-Runtime-5.90124"; + CatalystRuntime = buildPerlPackage { + pname = "Catalyst-Runtime"; + version = "5.90124"; src = fetchurl { url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90124.tar.gz; sha256 = "2a60cbe7c1f6fec25f0e7fd3f66273386d73edb625748cc0d8c4f20e62983e00"; @@ -1348,10 +1444,11 @@ let }; }; - CatalystPluginAccessLog = buildPerlPackage rec { - name = "Catalyst-Plugin-AccessLog-1.10"; + CatalystPluginAccessLog = buildPerlPackage { + pname = "Catalyst-Plugin-AccessLog"; + version = "1.10"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AR/ARODLAND/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AR/ARODLAND/Catalyst-Plugin-AccessLog-1.10.tar.gz; sha256 = "873db8e4e72a994e3e17aeb53d2b837e6d524b4b8b0f3539f262135c88cc2120"; }; propagatedBuildInputs = [ CatalystRuntime DateTime ]; @@ -1361,10 +1458,11 @@ let }; }; - CatalystPluginAuthentication = buildPerlPackage rec { - name = "Catalyst-Plugin-Authentication-0.10023"; + CatalystPluginAuthentication = buildPerlPackage { + pname = "Catalyst-Plugin-Authentication"; + version = "0.10023"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authentication-0.10023.tar.gz; sha256 = "0v6hb4r1wv3djrnqvnjcn3xx1scgqzx8nyjdg9lfc1ybvamrl0rn"; }; buildInputs = [ TestException ]; @@ -1375,10 +1473,11 @@ let }; }; - CatalystPluginAuthorizationACL = buildPerlPackage rec { - name = "Catalyst-Plugin-Authorization-ACL-0.16"; + CatalystPluginAuthorizationACL = buildPerlPackage { + pname = "Catalyst-Plugin-Authorization-ACL"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RK/RKITOVER/Catalyst-Plugin-Authorization-ACL-0.16.tar.gz; sha256 = "0z4328rr6l9xi45hyv6q9pwwamp0864q6skcp29jrz9f919ycdra"; }; propagatedBuildInputs = [ CatalystRuntime ClassThrowable ]; @@ -1386,7 +1485,8 @@ let }; CatalystPluginAuthorizationRoles = buildPerlPackage { - name = "Catalyst-Plugin-Authorization-Roles-0.09"; + pname = "Catalyst-Plugin-Authorization-Roles"; + version = "0.09"; src = fetchurl { url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authorization-Roles-0.09.tar.gz; sha256 = "0l83lkwmq0lngwh8b1rv3r719pn8w1gdbyhjqm74rnd0wbjl8h7f"; @@ -1400,7 +1500,8 @@ let }; CatalystPluginCache = buildPerlPackage { - name = "Catalyst-Plugin-Cache-0.12"; + pname = "Catalyst-Plugin-Cache"; + version = "0.12"; src = fetchurl { url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Cache-0.12.tar.gz; sha256 = "1q23aipvrl888h06ldr4mmjbykz0j4rqwipxg1jv094kki2fspr9"; @@ -1414,7 +1515,8 @@ let }; CatalystPluginCacheHTTP = buildPerlPackage { - name = "Catalyst-Plugin-Cache-HTTP-0.001000"; + pname = "Catalyst-Plugin-Cache-HTTP"; + version = "0.001000"; src = fetchurl { url = mirror://cpan/authors/id/G/GR/GRAF/Catalyst-Plugin-Cache-HTTP-0.001000.tar.gz; sha256 = "0v5iphbq4csc4r6wkvxnqlh97p8g0yhjky9qqmsdyqczn87agbba"; @@ -1428,7 +1530,8 @@ let }; CatalystPluginCaptcha = buildPerlPackage { - name = "Catalyst-Plugin-Captcha-0.04"; + pname = "Catalyst-Plugin-Captcha"; + version = "0.04"; src = fetchurl { url = mirror://cpan/authors/id/D/DI/DIEGOK/Catalyst-Plugin-Captcha-0.04.tar.gz; sha256 = "0llyj3v5nx9cx46jdbbvxf1lc9s9cxq5ml22xmx3wkb201r5qgaa"; @@ -1439,19 +1542,21 @@ let }; }; - CatalystPluginConfigLoader = buildPerlPackage rec { - name = "Catalyst-Plugin-ConfigLoader-0.34"; + CatalystPluginConfigLoader = buildPerlPackage { + pname = "Catalyst-Plugin-ConfigLoader"; + version = "0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-ConfigLoader-0.34.tar.gz; sha256 = "19j7p4v7mbx6wrmpvmrnd974apx7hdl2s095ga3b9zcbdrl77h5q"; }; propagatedBuildInputs = [ CatalystRuntime ConfigAny DataVisitor ]; }; - CatalystPluginFormValidator = buildPerlPackage rec { - name = "Catalyst-Plugin-FormValidator-0.094"; + CatalystPluginFormValidator = buildPerlPackage { + pname = "Catalyst-Plugin-FormValidator"; + version = "0.094"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DH/DHOSS/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DH/DHOSS/Catalyst-Plugin-FormValidator-0.094.tar.gz; sha256 = "5834f11bf5c9f4b5d336d65c7ce6639b76ce7bfe7a2875eb048d7ea1c82ce05a"; }; propagatedBuildInputs = [ CatalystRuntime DataFormValidator ]; @@ -1461,10 +1566,11 @@ let }; }; - CatalystPluginFormValidatorSimple = buildPerlPackage rec { - name = "Catalyst-Plugin-FormValidator-Simple-0.15"; + CatalystPluginFormValidatorSimple = buildPerlPackage { + pname = "Catalyst-Plugin-FormValidator-Simple"; + version = "0.15"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DH/DHOSS/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DH/DHOSS/Catalyst-Plugin-FormValidator-Simple-0.15.tar.gz; sha256 = "486c6a0e8f410fd017279f4804ab9e35ba46321d33a0a9721fe1e08a391de7a0"; }; propagatedBuildInputs = [ CatalystPluginFormValidator FormValidatorSimple ]; @@ -1473,10 +1579,11 @@ let }; }; - CatalystPluginLogHandler = buildPerlModule rec { - name = "Catalyst-Plugin-Log-Handler-0.08"; + CatalystPluginLogHandler = buildPerlModule { + pname = "Catalyst-Plugin-Log-Handler"; + version = "0.08"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEPE/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PE/PEPE/Catalyst-Plugin-Log-Handler-0.08.tar.gz; sha256 = "0db3c3a57b4ee3d789ba5129890e2858913fef00d8185bdc9c5d7fde31e043ef"; }; propagatedBuildInputs = [ ClassAccessor LogHandler MROCompat ]; @@ -1486,10 +1593,11 @@ let }; }; - CatalystPluginSession = buildPerlPackage rec { - name = "Catalyst-Plugin-Session-0.41"; + CatalystPluginSession = buildPerlPackage { + pname = "Catalyst-Plugin-Session"; + version = "0.41"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Plugin-Session-0.41.tar.gz; sha256 = "0a451997zc2vjx7rvndgx1ldbrpic8sfbddyvncynh0zr8bhlqc5"; }; buildInputs = [ TestDeep TestException TestWWWMechanizePSGI ]; @@ -1500,10 +1608,11 @@ let }; }; - CatalystPluginSessionDynamicExpiry = buildPerlPackage rec { - name = "Catalyst-Plugin-Session-DynamicExpiry-0.04"; + CatalystPluginSessionDynamicExpiry = buildPerlPackage { + pname = "Catalyst-Plugin-Session-DynamicExpiry"; + version = "0.04"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-DynamicExpiry-0.04.tar.gz; sha256 = "7707c56734cdb1512f733dc400fadf6f4c53cb217b58207857824dad6780a079"; }; propagatedBuildInputs = [ CatalystPluginSession ]; @@ -1513,17 +1622,19 @@ let }; }; - CatalystPluginSessionStateCookie = buildPerlPackage rec { - name = "Catalyst-Plugin-Session-State-Cookie-0.17"; + CatalystPluginSessionStateCookie = buildPerlPackage { + pname = "Catalyst-Plugin-Session-State-Cookie"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSTROUT/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MS/MSTROUT/Catalyst-Plugin-Session-State-Cookie-0.17.tar.gz; sha256 = "1rvxbfnpf9x2pc2zgpazlcgdlr2dijmxgmcs0m5nazs0w6xikssb"; }; propagatedBuildInputs = [ CatalystPluginSession ]; }; - CatalystPluginSessionStoreFastMmap = buildPerlPackage rec { - name = "Catalyst-Plugin-Session-Store-FastMmap-0.16"; + CatalystPluginSessionStoreFastMmap = buildPerlPackage { + pname = "Catalyst-Plugin-Session-Store-FastMmap"; + version = "0.16"; src = fetchurl { url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-Store-FastMmap-0.16.tar.gz; sha256 = "0x3j6zv3wr41jlwr6yb2jpmcx019ibyn11y8653ffnwhpzbpzsxs"; @@ -1531,10 +1642,11 @@ let propagatedBuildInputs = [ CacheFastMmap CatalystPluginSession ]; }; - CatalystPluginSessionStoreFile = buildPerlPackage rec { - name = "Catalyst-Plugin-Session-Store-File-0.18"; + CatalystPluginSessionStoreFile = buildPerlPackage { + pname = "Catalyst-Plugin-Session-Store-File"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FL/FLORA/Catalyst-Plugin-Session-Store-File-0.18.tar.gz; sha256 = "54738e3ce76f8be8b66947092d28973c73d79d1ee19b5d92b057552f8ff09b4f"; }; propagatedBuildInputs = [ CacheCache CatalystPluginSession ClassDataInheritable ]; @@ -1545,7 +1657,8 @@ let }; CatalystPluginStackTrace = buildPerlPackage { - name = "Catalyst-Plugin-StackTrace-0.12"; + pname = "Catalyst-Plugin-StackTrace"; + version = "0.12"; src = fetchurl { url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-StackTrace-0.12.tar.gz; sha256 = "1b2ksz74cpigxqzf63rddar3vfmnbpwpdcbs11v0ml89pb8ar79j"; @@ -1557,8 +1670,9 @@ let }; }; - CatalystPluginStaticSimple = buildPerlPackage rec { - name = "Catalyst-Plugin-Static-Simple-0.36"; + CatalystPluginStaticSimple = buildPerlPackage { + pname = "Catalyst-Plugin-Static-Simple"; + version = "0.36"; src = fetchurl { url = mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Plugin-Static-Simple-0.36.tar.gz; sha256 = "0m4l627p2fvzr4i6sgdxhdvsx4wpa6qmaibsbxlg5x5yjs7k7drn"; @@ -1571,10 +1685,11 @@ let }; }; - CatalystPluginStatusMessage = buildPerlPackage rec { - name = "Catalyst-Plugin-StatusMessage-1.002000"; + CatalystPluginStatusMessage = buildPerlPackage { + pname = "Catalyst-Plugin-StatusMessage"; + version = "1.002000"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HK/HKCLARK/${name}.tar.gz"; + url = mirror://cpan/authors/id/H/HK/HKCLARK/Catalyst-Plugin-StatusMessage-1.002000.tar.gz; sha256 = "649c894ab16f9f48ada8f9cc599a7ecbb8891ab3761ff6fd510520c6de407c1f"; }; propagatedBuildInputs = [ CatalystRuntime strictures ]; @@ -1584,10 +1699,11 @@ let }; }; - CatalystViewCSV = buildPerlPackage rec { - name = "Catalyst-View-CSV-1.7"; + CatalystViewCSV = buildPerlPackage { + pname = "Catalyst-View-CSV"; + version = "1.7"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MC/MCB/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MC/MCB/Catalyst-View-CSV-1.7.tar.gz; sha256 = "e41326b6099891f244b432921ed10096ac619f32b8c4f8b41633313bd54662db"; }; buildInputs = [ CatalystActionRenderView CatalystModelDBICSchema CatalystPluginConfigLoader CatalystXComponentTraits ConfigGeneral DBDSQLite DBIxClass TestException ]; @@ -1598,10 +1714,11 @@ let }; }; - CatalystViewDownload = buildPerlPackage rec { - name = "Catalyst-View-Download-0.09"; + CatalystViewDownload = buildPerlPackage { + pname = "Catalyst-View-Download"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAUDEON/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GA/GAUDEON/Catalyst-View-Download-0.09.tar.gz; sha256 = "1qgq6y9iwfbhbkbgpw9czang2ami6z8jk1zlagrzdisy4igqzkvs"; }; buildInputs = [ CatalystRuntime TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst TextCSV XMLSimple ]; @@ -1610,8 +1727,9 @@ let }; }; - CatalystViewJSON = buildPerlPackage rec { - name = "Catalyst-View-JSON-0.36"; + CatalystViewJSON = buildPerlPackage { + pname = "Catalyst-View-JSON"; + version = "0.36"; src = fetchurl { url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-View-JSON-0.36.tar.gz; sha256 = "0x943j1n2r0zqanyzdrs1xsnn8ayn2wqskn7h144xcqa6v6gcisl"; @@ -1624,10 +1742,11 @@ let }; }; - CatalystViewTT = buildPerlPackage rec { - name = "Catalyst-View-TT-0.44"; + CatalystViewTT = buildPerlPackage { + pname = "Catalyst-View-TT"; + version = "0.44"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-View-TT-0.44.tar.gz; sha256 = "06d1zg4nbb6kcyjbnyxrkf8z4zlscxr8650d94f7187jygfl8rvh"; }; propagatedBuildInputs = [ CatalystRuntime ClassAccessor TemplateTimer ]; @@ -1637,26 +1756,29 @@ let }; }; - CatalystXComponentTraits = buildPerlPackage rec { - name = "CatalystX-Component-Traits-0.19"; + CatalystXComponentTraits = buildPerlPackage { + pname = "CatalystX-Component-Traits"; + version = "0.19"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RK/RKITOVER/CatalystX-Component-Traits-0.19.tar.gz; sha256 = "0iq4ci8m6g2c4g01fvdl568y7pjz28f3widk986v3pyhr7ll8j88"; }; propagatedBuildInputs = [ CatalystRuntime MooseXTraitsPluggable ]; }; - CatalystXRoleApplicator = buildPerlPackage rec { - name = "CatalystX-RoleApplicator-0.005"; + CatalystXRoleApplicator = buildPerlPackage { + pname = "CatalystX-RoleApplicator"; + version = "0.005"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HD/HDP/${name}.tar.gz"; + url = mirror://cpan/authors/id/H/HD/HDP/CatalystX-RoleApplicator-0.005.tar.gz; sha256 = "0vwaapxn8g5hs2xp63c4dwv9jmapmji4272fakssvgc9frklg3p2"; }; propagatedBuildInputs = [ CatalystRuntime MooseXRelatedClassRoles ]; }; CatalystTraitForRequestProxyBase = buildPerlPackage { - name = "Catalyst-TraitFor-Request-ProxyBase-0.000005"; + pname = "Catalyst-TraitFor-Request-ProxyBase"; + version = "0.000005"; src = fetchurl { url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-TraitFor-Request-ProxyBase-0.000005.tar.gz; sha256 = "a7bf0faa7e12ca5df625d9f5fc710f11bfd16ba5385837e48d42b3d286c9710a"; @@ -1670,7 +1792,8 @@ let }; CatalystXScriptServerStarman = buildPerlPackage { - name = "CatalystX-Script-Server-Starman-0.03"; + pname = "CatalystX-Script-Server-Starman"; + version = "0.03"; src = fetchurl { url = mirror://cpan/authors/id/A/AB/ABRAXXA/CatalystX-Script-Server-Starman-0.03.tar.gz; sha256 = "08jvibq4v8xjj0c3cr93h0w8w0c88ajwjn37xjy7ygxl9krlffp6"; @@ -1687,10 +1810,11 @@ let }; }; - CDDB_get = buildPerlPackage rec { - name = "CDDB_get-2.28"; + CDDB_get = buildPerlPackage { + pname = "CDDB_get"; + version = "2.28"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FO/FONKIE/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FO/FONKIE/CDDB_get-2.28.tar.gz; sha256 = "1jfrwvfasylcafbvb0jjm94ad4v6k99a7rf5i4qwzhg4m0gvmk5x"; }; meta = { @@ -1700,10 +1824,11 @@ let }; }; - CGI = buildPerlPackage rec { - name = "CGI-4.42"; + CGI = buildPerlPackage { + pname = "CGI"; + version = "4.42"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz"; + url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.42.tar.gz; sha256 = "11d308e7dad2312d65747a7fdec5d0c22024c28df5e882e829ca1553482024e7"; }; buildInputs = [ TestDeep TestNoWarnings TestWarn ]; @@ -1714,8 +1839,9 @@ let }; }; - CGICompile = buildPerlModule rec { - name = "CGI-Compile-0.22"; + CGICompile = buildPerlModule { + pname = "CGI-Compile"; + version = "0.22"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-Compile-0.22.tar.gz; sha256 = "1bycbdgbsn88kavy0q8p2i7vn6lf3xk1y7v2rdl32gkrdff4w2gm"; @@ -1729,16 +1855,18 @@ let }; }; - CGICookieXS = buildPerlPackage rec { - name = "CGI-Cookie-XS-0.18"; + CGICookieXS = buildPerlPackage { + pname = "CGI-Cookie-XS"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AG/AGENT/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AG/AGENT/CGI-Cookie-XS-0.18.tar.gz; sha256 = "1iixvnm0l1q24vdlnayb4vd8fns2bdlhm6zb7fpi884ppm5cp6a6"; }; }; CGIEmulatePSGI = buildPerlPackage { - name = "CGI-Emulate-PSGI-0.23"; + pname = "CGI-Emulate-PSGI"; + version = "0.23"; src = fetchurl { url = mirror://cpan/authors/id/T/TO/TOKUHIROM/CGI-Emulate-PSGI-0.23.tar.gz; sha256 = "dd5b6c353f08fba100dae09904284f7f73f8328d31f6a67b2c136fad728d158b"; @@ -1753,7 +1881,8 @@ let }; CGIExpand = buildPerlPackage { - name = "CGI-Expand-2.05"; + pname = "CGI-Expand"; + version = "2.05"; src = fetchurl { url = mirror://cpan/authors/id/B/BO/BOWMANBS/CGI-Expand-2.05.tar.gz; sha256 = "1ad48nd067j5irjampxpw3zvzpg8wpnpan6szkdc5h64wccd30kf"; @@ -1765,7 +1894,8 @@ let }; CGIFast = buildPerlPackage { - name = "CGI-Fast-2.15"; + pname = "CGI-Fast"; + version = "2.15"; src = fetchurl { url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.15.tar.gz; sha256 = "e5342df3dc593edfb724c7afe850b1a0ee753f4d733f5193e037b04633dfeece"; @@ -1777,8 +1907,9 @@ let }; }; - CGIFormBuilder = buildPerlPackage rec { - name = "CGI-FormBuilder-3.10"; + CGIFormBuilder = buildPerlPackage { + pname = "CGI-FormBuilder"; + version = "3.10"; src = fetchurl { url = mirror://cpan/authors/id/B/BI/BIGPRESH/CGI-FormBuilder-3.10.tar.gz; sha256 = "163ixq9kninqq094z2rnkg9pv3bcmvjphlww4vksfrzhq3h9pjdf"; @@ -1787,10 +1918,11 @@ let propagatedBuildInputs = [ CGI ]; }; - CGIMinimal = buildPerlModule rec { - name = "CGI-Minimal-1.29"; + CGIMinimal = buildPerlModule { + pname = "CGI-Minimal"; + version = "1.29"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SN/SNOWHARE/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SN/SNOWHARE/CGI-Minimal-1.29.tar.gz; sha256 = "36c785ffacf5cdee4f1a7219ca1848b7e1700bdd71cd9116e1f00545ec88475d"; }; meta = { @@ -1800,7 +1932,8 @@ let }; CGIPSGI = buildPerlPackage { - name = "CGI-PSGI-0.15"; + pname = "CGI-PSGI"; + version = "0.15"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-PSGI-0.15.tar.gz; sha256 = "c50dcb10bf8486a9843baed032ad89d879ff2f41c993342dead62f947a598d91"; @@ -1812,17 +1945,19 @@ let }; }; - CGISession = buildPerlModule rec { - name = "CGI-Session-4.48"; + CGISession = buildPerlModule { + pname = "CGI-Session"; + version = "4.48"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKSTOS/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MARKSTOS/CGI-Session-4.48.tar.gz; sha256 = "1xsl2pz1jrh127pq0b01yffnj4mnp9nvkp88h5mndrscq9hn8xa6"; }; propagatedBuildInputs = [ CGI ]; }; - CGISimple = buildPerlModule rec { - name = "CGI-Simple-1.21"; + CGISimple = buildPerlModule { + pname = "CGI-Simple"; + version = "1.21"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.21.tar.gz; sha256 = "1wzc2igs4khmj7zfahvs87c24p9ks8hnqhhsyviyiix53xx2y6sg"; @@ -1836,7 +1971,8 @@ let }; CGIStruct = buildPerlPackage { - name = "CGI-Struct-1.21"; + pname = "CGI-Struct"; + version = "1.21"; src = fetchurl { url = mirror://cpan/authors/id/F/FU/FULLERMD/CGI-Struct-1.21.tar.gz; sha256 = "d13d8da7fdcd6d906054e4760fc28a718aec91bd3cf067a58927fb7cb1c09d6c"; @@ -1848,10 +1984,11 @@ let }; }; - CHI = buildPerlPackage rec { - name = "CHI-0.60"; + CHI = buildPerlPackage { + pname = "CHI"; + version = "0.60"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JS/JSWARTZ/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JS/JSWARTZ/CHI-0.60.tar.gz; sha256 = "c7f1a2b3570a8fede484e933f89ba1729e0abd05935791d146c522dd120ee851"; }; preConfigure = '' @@ -1866,8 +2003,9 @@ let }; }; - Chart = buildPerlPackage rec { - name = "Chart-2.4.10"; + Chart = buildPerlPackage { + pname = "Chart"; + version = "2.4.10"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHARTGRP/Chart-2.4.10.tar.gz; sha256 = "84bd99a1a0ce72477b15e35881e6120398bb3f553aeeb5e8d72b088520e4f6bf"; @@ -1880,7 +2018,8 @@ let }; ClassAccessor = buildPerlPackage { - name = "Class-Accessor-0.51"; + pname = "Class-Accessor"; + version = "0.51"; src = fetchurl { url = mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.51.tar.gz; sha256 = "07215zzr4ydf49832vn54i3gf2q5b97lydkv8j56wb2svvjs64mz"; @@ -1891,7 +2030,8 @@ let }; ClassAccessorChained = buildPerlModule { - name = "Class-Accessor-Chained-0.01"; + pname = "Class-Accessor-Chained"; + version = "0.01"; src = fetchurl { url = mirror://cpan/authors/id/R/RC/RCLAMP/Class-Accessor-Chained-0.01.tar.gz; sha256 = "1lilrjy1s0q5hyr0888kf0ifxjyl2iyk4vxil4jsv0sgh39lkgx5"; @@ -1900,7 +2040,8 @@ let }; ClassAccessorGrouped = buildPerlPackage { - name = "Class-Accessor-Grouped-0.10014"; + pname = "Class-Accessor-Grouped"; + version = "0.10014"; src = fetchurl { url = mirror://cpan/authors/id/H/HA/HAARG/Class-Accessor-Grouped-0.10014.tar.gz; sha256 = "35d5b03efc09f67f3a3155c9624126c3e162c8e3ca98ff826db358533a44c4bb"; @@ -1914,7 +2055,8 @@ let }; ClassAccessorLite = buildPerlPackage { - name = "Class-Accessor-Lite-0.08"; + pname = "Class-Accessor-Lite"; + version = "0.08"; src = fetchurl { url = mirror://cpan/authors/id/K/KA/KAZUHO/Class-Accessor-Lite-0.08.tar.gz; sha256 = "75b3b8ec8efe687677b63f0a10eef966e01f60735c56656ce75cbb44caba335a"; @@ -1925,10 +2067,11 @@ let }; }; - ClassAutouse = buildPerlPackage rec { - name = "Class-Autouse-2.01"; + ClassAutouse = buildPerlPackage { + pname = "Class-Autouse"; + version = "2.01"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AD/ADAMK/Class-Autouse-2.01.tar.gz; sha256 = "c05b3236c05719d819c20db0fdeb6d0954747e43d7a738294eed7fbcf36ecf1b"; }; meta = { @@ -1937,8 +2080,9 @@ let }; }; - ClassBase = buildPerlPackage rec { - name = "Class-Base-0.09"; + ClassBase = buildPerlPackage { + pname = "Class-Base"; + version = "0.09"; src = fetchurl { url = mirror://cpan/authors/id/Y/YA/YANICK/Class-Base-0.09.tar.gz; sha256 = "117dmsrb30a09zlrv919fb5h5rg8r4asa24i99k04n2habgbv9g1"; @@ -1946,10 +2090,11 @@ let propagatedBuildInputs = [ Clone ]; }; - ClassC3 = buildPerlPackage rec { - name = "Class-C3-0.34"; + ClassC3 = buildPerlPackage { + pname = "Class-C3"; + version = "0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; + url = mirror://cpan/authors/id/H/HA/HAARG/Class-C3-0.34.tar.gz; sha256 = "1dcibc31v5jwmi6hsdzi7c5ag1sb4wp3kxkibc889qrdj7jm12sd"; }; propagatedBuildInputs = [ AlgorithmC3 ]; @@ -1959,10 +2104,11 @@ let }; }; - ClassC3AdoptNEXT = buildPerlModule rec { - name = "Class-C3-Adopt-NEXT-0.14"; + ClassC3AdoptNEXT = buildPerlModule { + pname = "Class-C3-Adopt-NEXT"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/Class-C3-Adopt-NEXT-0.14.tar.gz; sha256 = "1xsbydmiskpa1qbmnf6n39cb83nlb432xgkad9kfhxnvm8jn4rw5"; }; buildInputs = [ ModuleBuildTiny TestException ]; @@ -1974,7 +2120,8 @@ let }; ClassC3Componentised = buildPerlPackage { - name = "Class-C3-Componentised-1.001002"; + pname = "Class-C3-Componentised"; + version = "1.001002"; src = fetchurl { url = mirror://cpan/authors/id/H/HA/HAARG/Class-C3-Componentised-1.001002.tar.gz; sha256 = "14wn1g45z3b5apqq7dcai5drk01hfyqydsd2m6hsxzhyvi3b2l9h"; @@ -1987,7 +2134,8 @@ let }; ClassClassgenclassgen = buildPerlPackage { - name = "Class-Classgen-classgen-3.03"; + pname = "Class-Classgen-classgen"; + version = "3.03"; src = fetchurl { url = mirror://cpan/authors/id/M/MS/MSCHLUE/Class-Classgen-classgen-3.03.tar.gz; sha256 = "9b65d41b991538992e816b32cc4fa9b4a4a0bb3e9c10e7eebeff82658dbbc8f6"; @@ -1995,7 +2143,8 @@ let }; ClassContainer = buildPerlModule { - name = "Class-Container-0.13"; + pname = "Class-Container"; + version = "0.13"; src = fetchurl { url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Class-Container-0.13.tar.gz; sha256 = "f5d495b1dfb826d5c0c45d03b4d0e6b6047cbb06cdbf6be15fd4dc902aeeb70b"; @@ -2008,7 +2157,8 @@ let }; ClassDataAccessor = buildPerlPackage { - name = "Class-Data-Accessor-0.04004"; + pname = "Class-Data-Accessor"; + version = "0.04004"; src = fetchurl { url = mirror://cpan/authors/id/C/CL/CLACO/Class-Data-Accessor-0.04004.tar.gz; sha256 = "0578m3rplk41059rkkjy1009xrmrdivjnv8yxadwwdk1vzidc8n1"; @@ -2016,17 +2166,19 @@ let }; ClassDataInheritable = buildPerlPackage { - name = "Class-Data-Inheritable-0.08"; + pname = "Class-Data-Inheritable"; + version = "0.08"; src = fetchurl { url = mirror://cpan/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz; sha256 = "0jpi38wy5xh6p1mg2cbyjjw76vgbccqp46685r27w8hmxb7gwrwr"; }; }; - ClassEHierarchy = buildPerlPackage rec { - name = "Class-EHierarchy-2.00"; + ClassEHierarchy = buildPerlPackage { + pname = "Class-EHierarchy"; + version = "2.00"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CO/CORLISS/Class-EHierarchy/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CO/CORLISS/Class-EHierarchy/Class-EHierarchy-2.00.tar.gz; sha256 = "8498baaf7539eaa3422c6fe1055a0fc9a0c02e94dad0c63405373528e622bacb"; }; meta = { @@ -2037,17 +2189,19 @@ let }; ClassFactory = buildPerlPackage { - name = "Class-Factory-1.06"; + pname = "Class-Factory"; + version = "1.06"; src = fetchurl { url = mirror://cpan/authors/id/P/PH/PHRED/Class-Factory-1.06.tar.gz; sha256 = "c37a2d269eb935f36a23e113480ae0946fa7c12a12781396a1226c8e435f30f5"; }; }; - ClassFactoryUtil = buildPerlModule rec { - name = "Class-Factory-Util-1.7"; + ClassFactoryUtil = buildPerlModule { + pname = "Class-Factory-Util"; + version = "1.7"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Class-Factory-Util-1.7.tar.gz; sha256 = "09ifd6v0c94vr20n9yr1dxgcp7hyscqq851szdip7y24bd26nlbc"; }; meta = { @@ -2057,7 +2211,8 @@ let }; ClassInspector = buildPerlPackage { - name = "Class-Inspector-1.34"; + pname = "Class-Inspector"; + version = "1.34"; src = fetchurl { url = mirror://cpan/authors/id/P/PL/PLICEASE/Class-Inspector-1.34.tar.gz; sha256 = "1n7h3jzwdz5a8gmz515xfr7ic82dl5sbdrk5d2fskiycngf8d6py"; @@ -2069,7 +2224,8 @@ let }; ClassISA = buildPerlPackage { - name = "Class-ISA-0.36"; + pname = "Class-ISA"; + version = "0.36"; src = fetchurl { url = mirror://cpan/authors/id/S/SM/SMUELLER/Class-ISA-0.36.tar.gz; sha256 = "0r5r574i6wgxm8zsq4bc34d0dzprrh6h6mpp1nhlks1qk97g65l8"; @@ -2077,7 +2233,8 @@ let }; ClassIterator = buildPerlPackage { - name = "Class-Iterator-0.3"; + pname = "Class-Iterator"; + version = "0.3"; src = fetchurl { url = mirror://cpan/authors/id/T/TE/TEXMEC/Class-Iterator-0.3.tar.gz; sha256 = "db1ba87ca9107f161fe9c1e9e7e267c0026defc26fe3e73bcad8ab8ffc18ef9d"; @@ -2086,10 +2243,11 @@ let }; }; - ClassMakeMethods = buildPerlPackage rec { - name = "Class-MakeMethods-1.01"; + ClassMakeMethods = buildPerlPackage { + pname = "Class-MakeMethods"; + version = "1.01"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EV/EVO/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/EV/EVO/Class-MakeMethods-1.01.tar.gz; sha256 = "0ricb0mn0i06ngfhq5y035yx8i7ahlx83yyqwixqmv6hg4p79b5c"; }; preConfigure = '' @@ -2098,10 +2256,11 @@ let ''; }; - ClassMethodMaker = buildPerlPackage rec { - name = "Class-MethodMaker-2.24"; + ClassMethodMaker = buildPerlPackage { + pname = "Class-MethodMaker"; + version = "2.24"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SC/SCHWIGON/class-methodmaker/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-2.24.tar.gz; sha256 = "0a03i4k3a33qqwhykhz5k437ld5mag2vq52vvsy03gbynb65ivsy"; }; # Remove unnecessary, non-autoconf, configure script. @@ -2112,10 +2271,11 @@ let }; }; - ClassMethodModifiers = buildPerlPackage rec { - name = "Class-Method-Modifiers-2.12"; + ClassMethodModifiers = buildPerlPackage { + pname = "Class-Method-Modifiers"; + version = "2.12"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.12.tar.gz; sha256 = "1j3swa212wh14dq5r6zjarm2lzpx6mrdfplpjy65px8b09ri0k74"; }; buildInputs = [ TestFatal TestRequires ]; @@ -2126,10 +2286,11 @@ let }; }; - ClassMix = buildPerlModule rec { - name = "Class-Mix-0.006"; + ClassMix = buildPerlModule { + pname = "Class-Mix"; + version = "0.006"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Class-Mix-0.006.tar.gz; sha256 = "8747f643893914f8c44979f1716d0c1ec8a41394796555447944e860f1ff7c0b"; }; propagatedBuildInputs = [ ParamsClassify ]; @@ -2139,10 +2300,11 @@ let }; }; - ClassReturnValue = buildPerlPackage rec { - name = "Class-ReturnValue-0.55"; + ClassReturnValue = buildPerlPackage { + pname = "Class-ReturnValue"; + version = "0.55"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JE/JESSE/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JE/JESSE/Class-ReturnValue-0.55.tar.gz; sha256 = "ed3836885d78f734ccd7a98550ec422a616df7c31310c1b7b1f6459f5fb0e4bd"; }; propagatedBuildInputs = [ DevelStackTrace ]; @@ -2152,24 +2314,27 @@ let }; }; - ClassSingleton = buildPerlPackage rec { - name = "Class-Singleton-1.5"; + ClassSingleton = buildPerlPackage { + pname = "Class-Singleton"; + version = "1.5"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHAY/Class-Singleton-1.5.tar.gz; sha256 = "0y7ngrjf551bjgmijp5rsidbkq6c8hb5lmy2jcqq0fify020s8iq"; }; }; - ClassThrowable = buildPerlPackage rec { - name = "Class-Throwable-0.13"; + ClassThrowable = buildPerlPackage { + pname = "Class-Throwable"; + version = "0.13"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KM/KMX/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KM/KMX/Class-Throwable-0.13.tar.gz; sha256 = "1kmwzdxvp9ca2z44vl0ygkfygdbxqkilzjd8vqhc4vdmvbh136nw"; }; }; - ClassTiny = buildPerlPackage rec { - name = "Class-Tiny-1.006"; + ClassTiny = buildPerlPackage { + pname = "Class-Tiny"; + version = "1.006"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.006.tar.gz; sha256 = "0knbi1agcfc9d7fca0szvxr6335pb22pc5n648q1vrcba8qvvz1f"; @@ -2181,10 +2346,11 @@ let }; }; - ClassLoad = buildPerlPackage rec { - name = "Class-Load-0.25"; + ClassLoad = buildPerlPackage { + pname = "Class-Load"; + version = "0.25"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/Class-Load-0.25.tar.gz; sha256 = "2a48fa779b5297e56156380e8b32637c6c58decb4f4a7f3c7350523e11275f8f"; }; buildInputs = [ TestFatal TestNeeds ]; @@ -2196,10 +2362,11 @@ let }; }; - ClassLoadXS = buildPerlPackage rec { - name = "Class-Load-XS-0.10"; + ClassLoadXS = buildPerlPackage { + pname = "Class-Load-XS"; + version = "0.10"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/Class-Load-XS-0.10.tar.gz; sha256 = "5bc22cf536ebfd2564c5bdaf42f0d8a4cee3d1930fc8b44b7d4a42038622add1"; }; buildInputs = [ TestFatal TestNeeds ]; @@ -2212,7 +2379,8 @@ let }; ClassObservable = buildPerlPackage { - name = "Class-Observable-1.04"; + pname = "Class-Observable"; + version = "1.04"; src = fetchurl { url = mirror://cpan/authors/id/C/CW/CWINTERS/Class-Observable-1.04.tar.gz; sha256 = "3ef18733a0f03c113f3bcf8ac50476e09ca1fe6234f4aaacaa24dfca95168094"; @@ -2221,7 +2389,8 @@ let }; ClassStd = buildPerlModule { - name = "Class-Std-0.013"; + pname = "Class-Std"; + version = "0.013"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHORNY/Class-Std-0.013.tar.gz; sha256 = "bcd6d82f6c8af0fe069fced7dd165a4795b0b6e92351c7d4e5a1ab9a14fc35c6"; @@ -2232,12 +2401,11 @@ let }; }; - ClassStdFast = buildPerlModule rec { - name = "${pname}-${version}"; + ClassStdFast = buildPerlModule { pname = "Class-Std-Fast"; version = "0.0.8"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AC/ACID/${pname}-v${version}.tar.gz"; + url = mirror://cpan/authors/id/A/AC/ACID/Class-Std-Fast-v0.0.8.tar.gz; sha256 = "1057rz95jsr66gam472i4zdv04v7bmzph3m3jwq1hwx3qrikgm0v"; }; propagatedBuildInputs = [ ClassStd ]; @@ -2248,20 +2416,22 @@ let }; }; - ClassUnload = buildPerlPackage rec { - name = "Class-Unload-0.11"; + ClassUnload = buildPerlPackage { + pname = "Class-Unload"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; + url = mirror://cpan/authors/id/I/IL/ILMARI/Class-Unload-0.11.tar.gz; sha256 = "0pqa98z3ij6a3v9wkmvc8b410kv30y0xxqf0i6if3lp4lx3rgqjj"; }; propagatedBuildInputs = [ ClassInspector ]; buildInputs = [ TestRequires ]; }; - ClassVirtual = buildPerlPackage rec { - name = "Class-Virtual-0.08"; + ClassVirtual = buildPerlPackage { + pname = "Class-Virtual"; + version = "0.08"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHWERN/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MS/MSCHWERN/Class-Virtual-0.08.tar.gz; sha256 = "c6499b42d3b4e5c6488a5e82fbc28698e6c9860165072dddfa6749355a9cfbb2"; }; propagatedBuildInputs = [ CarpAssert ClassDataInheritable ClassISA ]; @@ -2272,7 +2442,8 @@ let }; ClassXSAccessor = buildPerlPackage { - name = "Class-XSAccessor-1.19"; + pname = "Class-XSAccessor"; + version = "1.19"; src = fetchurl { url = mirror://cpan/authors/id/S/SM/SMUELLER/Class-XSAccessor-1.19.tar.gz; sha256 = "1wm6013il899jnm0vn50a7iv9v6r4nqywbqzj0csyf8jbwwnpicr"; @@ -2284,7 +2455,8 @@ let }; Clipboard = buildPerlModule { - name = "Clipboard-0.20"; + pname = "Clipboard"; + version = "0.20"; src = fetchurl { url = mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.20.tar.gz; sha256 = "3f7d0a8eafec57072f9574dfd552e1cb8db26c09079c50dbef38f3c97ce25f60"; @@ -2302,10 +2474,11 @@ let }; - Clone = buildPerlPackage rec { - name = "Clone-0.41"; + Clone = buildPerlPackage { + pname = "Clone"; + version = "0.41"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GARU/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GA/GARU/Clone-0.41.tar.gz; sha256 = "060mlm31lacirpnp5fl9jqk4m9cl07vjlh89k83qk25wykf5dh78"; }; meta = { @@ -2314,8 +2487,9 @@ let }; }; - CloneChoose = buildPerlPackage rec { - name = "Clone-Choose-0.010"; + CloneChoose = buildPerlPackage { + pname = "Clone-Choose"; + version = "0.010"; src = fetchurl { url = mirror://cpan/authors/id/H/HE/HERMES/Clone-Choose-0.010.tar.gz; sha256 = "0cin2bjn5z8xhm9v4j7pwlkx88jnvz8al0njdjwyvs6fb0glh8sn"; @@ -2327,8 +2501,9 @@ let }; }; - ClonePP = buildPerlPackage rec { - name = "Clone-PP-1.07"; + ClonePP = buildPerlPackage { + pname = "Clone-PP"; + version = "1.07"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEILB/Clone-PP-1.07.tar.gz; sha256 = "15dkhqvih6rx9dnngfwwljcm9s8afb0nbyl2vdvhd8frnw4y31dz"; @@ -2338,8 +2513,9 @@ let }; }; - CodeTidyAll = buildPerlPackage rec { - name = "Code-TidyAll-0.73"; + CodeTidyAll = buildPerlPackage { + pname = "Code-TidyAll"; + version = "0.73"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.73.tar.gz; sha256 = "1fvw73q5vj5b12y9jj9mmwl0dipdjlvpsw5rzvldr4csicrpiz6q"; @@ -2352,8 +2528,9 @@ let }; }; - CodeTidyAllPluginPerlAlignMooseAttributes = buildPerlPackage rec { - name = "Code-TidyAll-Plugin-Perl-AlignMooseAttributes-0.01"; + CodeTidyAllPluginPerlAlignMooseAttributes = buildPerlPackage { + pname = "Code-TidyAll-Plugin-Perl-AlignMooseAttributes"; + version = "0.01"; src = fetchurl { url = mirror://cpan/authors/id/J/JS/JSWARTZ/Code-TidyAll-Plugin-Perl-AlignMooseAttributes-0.01.tar.gz; sha256 = "1r8w5kfm17j1dyrrsjhwww423zzdzhx1i3d3brl32wzhasgf47cd"; @@ -2365,10 +2542,11 @@ let }; }; - commonsense = buildPerlPackage rec { - name = "common-sense-3.74"; + commonsense = buildPerlPackage { + pname = "common-sense"; + version = "3.74"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.74.tar.gz; sha256 = "1wxv2s0hbjkrnssvxvsds0k213awg5pgdlrpkr6xkpnimc17s7vp"; }; meta = { @@ -2378,7 +2556,8 @@ let }; CompressBzip2 = buildPerlPackage { - name = "Compress-Bzip2-2.26"; + pname = "Compress-Bzip2"; + version = "2.26"; src = fetchurl { url = mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.26.tar.gz; sha256 = "5132f0c5f377a54d77ee36d332aa0ece585c22a40f2c31f2619e40262f5c4f0c"; @@ -2389,10 +2568,11 @@ let }; }; - CompressRawBzip2 = buildPerlPackage rec { - name = "Compress-Raw-Bzip2-2.086"; + CompressRawBzip2 = buildPerlPackage { + pname = "Compress-Raw-Bzip2"; + version = "2.086"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.086.tar.gz; sha256 = "16gkm5m5hr8129h93r0liyyqffvh820wrlvxal8cn8bdcx59bls6"; }; @@ -2409,16 +2589,18 @@ let CompressRawZlib = callPackage ../development/perl-modules/Compress-Raw-Zlib { }; - CompressUnLZMA = buildPerlPackage rec { - name = "Compress-unLZMA-0.05"; + CompressUnLZMA = buildPerlPackage { + pname = "Compress-unLZMA"; + version = "0.05"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FE/FERREIRA/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FE/FERREIRA/Compress-unLZMA-0.05.tar.gz; sha256 = "1f0pcpcjjj60whqc5sc5jd0dd7z3si4fnp268w4ykmcjini03s2d"; }; }; - ConfigAny = buildPerlPackage rec { - name = "Config-Any-0.32"; + ConfigAny = buildPerlPackage { + pname = "Config-Any"; + version = "0.32"; src = fetchurl { url = mirror://cpan/authors/id/H/HA/HAARG/Config-Any-0.32.tar.gz; sha256 = "0l31sg7dwh4dwwnql42hp7arkhcm15bhsgfg4i6xvbjzy9f2mnk8"; @@ -2430,8 +2612,9 @@ let }; }; - ConfigAutoConf = buildPerlPackage rec { - name = "Config-AutoConf-0.317"; + ConfigAutoConf = buildPerlPackage { + pname = "Config-AutoConf"; + version = "0.317"; src = fetchurl { url = mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.317.tar.gz; sha256 = "1qcwib4yaml5z2283qy5khjcydyibklsnk8zrk9wzdzc5wnv5r01"; @@ -2443,10 +2626,11 @@ let }; }; - ConfigGeneral = buildPerlPackage rec { - name = "Config-General-2.63"; + ConfigGeneral = buildPerlPackage { + pname = "Config-General"; + version = "2.63"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TL/TLINDEN/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.63.tar.gz; sha256 = "1bbg3wp0xcpj04cmm86j1x0j5968jqi5s2c87qs7dgmap1vzk6qa"; }; meta = { @@ -2455,7 +2639,8 @@ let }; ConfigGitLike = buildPerlPackage { - name = "Config-GitLike-1.17"; + pname = "Config-GitLike"; + version = "1.17"; src = fetchurl { url = mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.17.tar.gz; sha256 = "674a07b814fdcf9d323088d093245bcd066aaee24ec0914cb4decc9a943de54e"; @@ -2468,10 +2653,11 @@ let }; }; - ConfigGrammar = buildPerlPackage rec { - name = "Config-Grammar-1.13"; + ConfigGrammar = buildPerlPackage { + pname = "Config-Grammar"; + version = "1.13"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DS/DSCHWEI/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DS/DSCHWEI/Config-Grammar-1.13.tar.gz; sha256 = "a8b3a3a2c9c8c43b92dc401bf2709d6514f15b467fd4f72c48d356335771d6e3"; }; meta = { @@ -2481,10 +2667,11 @@ let }; }; - ConfigINI = buildPerlPackage rec { - name = "Config-INI-0.025"; + ConfigINI = buildPerlPackage { + pname = "Config-INI"; + version = "0.025"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Config-INI-0.025.tar.gz; sha256 = "628bf76d5b91f89dde22d4813ec033026ebf71b772bb61ccda909da00c869732"; }; propagatedBuildInputs = [ MixinLinewise ]; @@ -2495,8 +2682,9 @@ let }; }; - ConfigIdentity = buildPerlPackage rec { - name = "Config-Identity-0.0019"; + ConfigIdentity = buildPerlPackage { + pname = "Config-Identity"; + version = "0.0019"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Config-Identity-0.0019.tar.gz; sha256 = "1a0jx12pxwpbnkww4xg4lav8j6ls89hrdimhj4a697k56zdhnli9"; @@ -2510,10 +2698,11 @@ let }; }; - ConfigIniFiles = buildPerlModule rec { - name = "Config-IniFiles-3.000002"; + ConfigIniFiles = buildPerlModule { + pname = "Config-IniFiles"; + version = "3.000002"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-3.000002.tar.gz; sha256 = "d92ed6ed2db98d5addf732c96d2a9c15d9f878c7e8b355bb7a5c1668e3f8ba09"; }; propagatedBuildInputs = [ IOStringy ]; @@ -2525,7 +2714,8 @@ let }; ConfigMerge = buildPerlPackage { - name = "Config-Merge-1.04"; + pname = "Config-Merge"; + version = "1.04"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DRTECH/Config-Merge-1.04.tar.gz; sha256 = "a932477b43ae5fb04a16f071a891da7bd2086c10c680592f2888fa9d9972cccf"; @@ -2539,7 +2729,8 @@ let }; ConfigMVP = buildPerlPackage { - name = "Config-MVP-2.200011"; + pname = "Config-MVP"; + version = "2.200011"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200011.tar.gz; sha256 = "23c95666fc43c4adaebcc093b1b56091efc2a6aa2d75366a216d18eda96ad716"; @@ -2553,10 +2744,11 @@ let }; }; - ConfigMVPReaderINI = buildPerlPackage rec { - name = "Config-MVP-Reader-INI-2.101463"; + ConfigMVPReaderINI = buildPerlPackage { + pname = "Config-MVP-Reader-INI"; + version = "2.101463"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-Reader-INI-2.101463.tar.gz; sha256 = "0iflnsh0sgihff3ra8sr7awiiscmqvrp1anaskkwksqi6yzidab9"; }; propagatedBuildInputs = [ ConfigINI ConfigMVP ]; @@ -2568,7 +2760,8 @@ let }; ConfigStd = buildPerlModule { - name = "Config-Std-0.903"; + pname = "Config-Std"; + version = "0.903"; src = fetchurl { url = mirror://cpan/authors/id/B/BR/BRICKER/Config-Std-0.903.tar.gz; sha256 = "b7709ff663bd279d264ab9c2f51e9e9588479a3367a8c4cfc18659c2a11480fe"; @@ -2579,16 +2772,18 @@ let }; }; - ConfigTiny = buildPerlPackage rec { - name = "Config-Tiny-2.23"; + ConfigTiny = buildPerlPackage { + pname = "Config-Tiny"; + version = "2.23"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSAVAGE/${name}.tgz"; + url = mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.23.tgz; sha256 = "037524cpx962cjdgcp1m8sd30s43g3zvwfn4hmjvq322xpind2ls"; }; }; ConfigVersioned = buildPerlPackage { - name = "Config-Versioned-1.01"; + pname = "Config-Versioned"; + version = "1.01"; src = fetchurl { url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Config-Versioned-1.01.tar.gz; sha256 = "bc9a4ae3738bd89f86a07bca673627ca3c92ba969737cd6dbc7ab7ad17cd2348"; @@ -2601,10 +2796,11 @@ let }; }; - Connector = buildPerlPackage rec { - name = "Connector-1.26"; + Connector = buildPerlPackage { + pname = "Connector"; + version = "1.26"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.26.tar.gz; sha256 = "9852c2b43a8201996530deb1d3aa7fda18abe1ce24c80fbdebd7981cd2f05c45"; }; buildInputs = [ ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI ProcSafeExec TemplateToolkit YAML ]; @@ -2620,8 +2816,9 @@ let }; }; - ConstFast = buildPerlModule rec { - name = "Const-Fast-0.014"; + ConstFast = buildPerlModule { + pname = "Const-Fast"; + version = "0.014"; src = fetchurl { url = mirror://cpan/authors/id/L/LE/LEONT/Const-Fast-0.014.tar.gz; sha256 = "1nwlldgrx86yn7y6a53cqgvzm2ircsvxg1addahlcy6510x9a1gq"; @@ -2634,16 +2831,18 @@ let }; }; - ConvertASN1 = buildPerlPackage rec { - name = "Convert-ASN1-0.27"; + ConvertASN1 = buildPerlPackage { + pname = "Convert-ASN1"; + version = "0.27"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GB/GBARR/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.27.tar.gz; sha256 = "12nmsca6hzgxq57sx7dp8yq6zxqhl41z5a6018877sf5w25ag93l"; }; }; ConvertColor = buildPerlModule { - name = "Convert-Color-0.11"; + pname = "Convert-Color"; + version = "0.11"; src = fetchurl { url = mirror://cpan/authors/id/P/PE/PEVANS/Convert-Color-0.11.tar.gz; sha256 = "b41217c72931034ba4417d7a9e1e2999f04580d4e6b31c70993fedccc2440d38"; @@ -2657,7 +2856,8 @@ let }; constantboolean = buildPerlModule { - name = "constant-boolean-0.02"; + pname = "constant-boolean"; + version = "0.02"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/constant-boolean-0.02.tar.gz; sha256 = "1s8gxfg4xqp543aqanv5lbp64vqqyw6ic4x3fm4imkk1h3amjb6d"; @@ -2665,8 +2865,9 @@ let propagatedBuildInputs = [ SymbolUtil ]; }; - curry = buildPerlPackage rec { - name = "curry-1.001000"; + curry = buildPerlPackage { + pname = "curry"; + version = "1.001000"; src = fetchurl { url = mirror://cpan/authors/id/M/MS/MSTROUT/curry-1.001000.tar.gz; sha256 = "1m2n3w67cskh8ic6vf6ik0fmap9zma875kr5rhyznr1041wn064b"; @@ -2677,16 +2878,18 @@ let }; }; - constant-defer = buildPerlPackage rec { - name = "constant-defer-6"; + constant-defer = buildPerlPackage { + pname = "constant-defer"; + version = "6"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KR/KRYDE/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KR/KRYDE/constant-defer-6.tar.gz; sha256 = "1ykgk0rd05p7kyrdxbv047fj7r0b4ix9ibpkzxp6h8nak0qjc8bv"; }; }; - ContextPreserve = buildPerlPackage rec { - name = "Context-Preserve-0.03"; + ContextPreserve = buildPerlPackage { + pname = "Context-Preserve"; + version = "0.03"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Context-Preserve-0.03.tar.gz; sha256 = "07zxgmb11bn4zj3w9g1zwbb9iv4jyk5q7hc0nv59knvv5i64m489"; @@ -2694,10 +2897,11 @@ let buildInputs = [ TestException TestSimple13 ]; }; - CookieBaker = buildPerlModule rec { - name = "Cookie-Baker-0.10"; + CookieBaker = buildPerlModule { + pname = "Cookie-Baker"; + version = "0.10"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KA/KAZEBURO/Cookie-Baker-0.10.tar.gz; sha256 = "b42bad15b12da4cdc5c90c902faf3ad484281a42203fa4e7652866434f6fa4dd"; }; buildInputs = [ ModuleBuildTiny TestTime ]; @@ -2709,17 +2913,19 @@ let }; }; - CookieXS = buildPerlPackage rec { - name = "Cookie-XS-0.11"; + CookieXS = buildPerlPackage { + pname = "Cookie-XS"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AG/AGENT/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AG/AGENT/Cookie-XS-0.11.tar.gz; sha256 = "1616rcn2qn1cwiv3rxb8mq5fmwxpj4gya1lxxxq2w952h03p3fd3"; }; propagatedBuildInputs = [ CGICookieXS ]; }; - Coro = buildPerlPackage rec { - name = "Coro-6.54"; + Coro = buildPerlPackage { + pname = "Coro"; + version = "6.54"; src = fetchurl { url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.54.tar.gz; sha256 = "0a00b351m7fxm39vfk726wpva2xx8qxlx5nv4yjgkbqap502ld2m"; @@ -2730,8 +2936,9 @@ let }; }; - Corona = buildPerlPackage rec { - name = "Corona-0.1004"; + Corona = buildPerlPackage { + pname = "Corona"; + version = "0.1004"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Corona-0.1004.tar.gz; sha256 = "0g5gpma3998rn61qfjv5csv2nrdi4sc84ipkb4k6synyhfgd3xgz"; @@ -2744,10 +2951,11 @@ let }; }; - CPAN = buildPerlPackage rec { - name = "CPAN-2.26"; + CPAN = buildPerlPackage { + pname = "CPAN"; + version = "2.26"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.26.tar.gz; sha256 = "0db80ce17c374affa71534033bcac94a213912d6b35f5379e263ae3d7c98ae5c"; }; propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; @@ -2757,10 +2965,11 @@ let }; }; - CpanelJSONXS = buildPerlPackage rec { - name = "Cpanel-JSON-XS-4.11"; + CpanelJSONXS = buildPerlPackage { + pname = "Cpanel-JSON-XS"; + version = "4.11"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.11.tar.gz; sha256 = "08d17df7d373868a154bfa687f54fa06e0691836af8470fb29d538215d82bc78"; }; meta = { @@ -2769,10 +2978,11 @@ let }; }; - CPANChanges = buildPerlPackage rec { - name = "CPAN-Changes-0.400002"; + CPANChanges = buildPerlPackage { + pname = "CPAN-Changes"; + version = "0.400002"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; + url = mirror://cpan/authors/id/H/HA/HAARG/CPAN-Changes-0.400002.tar.gz; sha256 = "01eedea90d07468cb58e4a50bfa3bb1d4eeda9073596add1118fc359153abe8d"; }; meta = { @@ -2782,7 +2992,8 @@ let }; CPANChecksums = buildPerlPackage { - name = "CPAN-Checksums-2.12"; + pname = "CPAN-Checksums"; + version = "2.12"; src = fetchurl { url = mirror://cpan/authors/id/A/AN/ANDK/CPAN-Checksums-2.12.tar.gz; sha256 = "0f1dbpp4638jfdfwrywjmz88na5wzw4fdsmm2r7gh1x0s6r0yq4r"; @@ -2793,10 +3004,11 @@ let }; }; - CPANCommonIndex = buildPerlPackage rec { - name = "CPAN-Common-Index-0.010"; + CPANCommonIndex = buildPerlPackage { + pname = "CPAN-Common-Index"; + version = "0.010"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Common-Index-0.010.tar.gz; sha256 = "c43ddbb22fd42b06118fe6357f53700fbd77f531ba3c427faafbf303cbf4eaf0"; }; buildInputs = [ TestDeep TestFailWarnings TestFatal ]; @@ -2808,8 +3020,9 @@ let }; }; - CPANDistnameInfo = buildPerlPackage rec { - name = "CPAN-DistnameInfo-0.12"; + CPANDistnameInfo = buildPerlPackage { + pname = "CPAN-DistnameInfo"; + version = "0.12"; src = fetchurl { url = mirror://cpan/authors/id/G/GB/GBARR/CPAN-DistnameInfo-0.12.tar.gz; sha256 = "0d94kx596w7k328cvq4y96z1gz12hdhn3z1mklkbrb7fyzlzn91g"; @@ -2820,10 +3033,11 @@ let }; }; - CPANMetaCheck = buildPerlPackage rec { - name = "CPAN-Meta-Check-0.014"; + CPANMetaCheck = buildPerlPackage { + pname = "CPAN-Meta-Check"; + version = "0.014"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; + url = mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.014.tar.gz; sha256 = "07rmdbz1rbnb7w33vswn1wixlyh947sqr93xrvcph1hwzhmmg818"; }; buildInputs = [ TestDeep ]; @@ -2833,10 +3047,11 @@ let }; }; - CPANPerlReleases = buildPerlPackage rec { - name = "CPAN-Perl-Releases-3.94"; + CPANPerlReleases = buildPerlPackage { + pname = "CPAN-Perl-Releases"; + version = "3.94"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-3.94.tar.gz; sha256 = "12g3mdl8lziz218a5rlflhbd295paqfqq5f9ylkdr00pnss5jfnp"; }; meta = { @@ -2846,10 +3061,11 @@ let }; }; - CPANPLUS = buildPerlPackage rec { - name = "CPANPLUS-0.9176"; + CPANPLUS = buildPerlPackage { + pname = "CPANPLUS"; + version = "0.9176"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9176.tar.gz; sha256 = "09fypxwd13fraarq6qznmw04n1zh2f2ykdz037jmzm4m2ic8n8xc"; }; propagatedBuildInputs = [ ArchiveExtract ModulePluggable ObjectAccessor PackageConstants TermUI ]; @@ -2860,10 +3076,11 @@ let }; }; - CPANUploader = buildPerlPackage rec { - name = "CPAN-Uploader-0.103013"; + CPANUploader = buildPerlPackage { + pname = "CPAN-Uploader"; + version = "0.103013"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103013.tar.gz; sha256 = "07k8ia8gvj9mrz7a2lckgd3vxjsahfr43lgrb85474dkhz94f5pq"; }; propagatedBuildInputs = [ FileHomeDir GetoptLongDescriptive LWPProtocolHttps TermReadKey ]; @@ -2874,24 +3091,27 @@ let }; }; - CryptBlowfish = buildPerlPackage rec { - name = "Crypt-Blowfish-2.14"; + CryptBlowfish = buildPerlPackage { + pname = "Crypt-Blowfish"; + version = "2.14"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DP/DPARIS/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DP/DPARIS/Crypt-Blowfish-2.14.tar.gz; sha256 = "1cb7g8cyfs9alrfdykxhs8m6azj091fmcycz6p5vkxbbzcgl7cs6"; }; }; - CryptCBC = buildPerlPackage rec { - name = "Crypt-CBC-2.33"; + CryptCBC = buildPerlPackage { + pname = "Crypt-CBC"; + version = "2.33"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz"; + url = mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-2.33.tar.gz; sha256 = "0ig698lmpjz7fslnznxm0609lvlnvf4f3s370082nzycnqhxww3a"; }; }; CryptCurve25519 = buildPerlPackage { - name = "Crypt-Curve25519-0.06"; + pname = "Crypt-Curve25519"; + version = "0.06"; src = fetchurl { url = mirror://cpan/authors/id/A/AJ/AJGB/Crypt-Curve25519-0.06.tar.gz; sha256 = "1ir0gfxm8i7r9zyfs2zvil5jgwirl7j6cb9cm1p2kjpfnhyp0j4z"; @@ -2902,27 +3122,30 @@ let }; }; - CryptDES = buildPerlPackage rec { - name = "Crypt-DES-2.07"; + CryptDES = buildPerlPackage { + pname = "Crypt-DES"; + version = "2.07"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DP/DPARIS/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DP/DPARIS/Crypt-DES-2.07.tar.gz; sha256 = "1rypxlhpd1jc0c327aghgl9y6ls47drmpvn0a40b4k3vhfsypc9d"; }; }; - CryptDH = buildPerlPackage rec { - name = "Crypt-DH-0.07"; + CryptDH = buildPerlPackage { + pname = "Crypt-DH"; + version = "0.07"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MITHALDU/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MITHALDU/Crypt-DH-0.07.tar.gz; sha256 = "0pvzlgwpx8fzdy64ki15155vhsj30i9zxmw6i4p7irh17d1g7368"; }; propagatedBuildInputs = [ MathBigIntGMP ]; }; - CryptDHGMP = buildPerlPackage rec { - name = "Crypt-DH-GMP-0.00012"; + CryptDHGMP = buildPerlPackage { + pname = "Crypt-DH-GMP"; + version = "0.00012"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DM/DMAKI/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DM/DMAKI/Crypt-DH-GMP-0.00012.tar.gz; sha256 = "0f5gdprcql4kwzgxl2s6ngcfg1jl45lzcqh7dkv5bkwlwmxa9rsi"; }; buildInputs = [ pkgs.gmp DevelChecklib TestRequires ]; @@ -2930,27 +3153,30 @@ let NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; }; - CryptEksblowfish = buildPerlModule rec { - name = "Crypt-Eksblowfish-0.009"; + CryptEksblowfish = buildPerlModule { + pname = "Crypt-Eksblowfish"; + version = "0.009"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Crypt-Eksblowfish-0.009.tar.gz; sha256 = "3cc7126d5841107237a9be2dc5c7fbc167cf3c4b4ce34678a8448b850757014c"; }; propagatedBuildInputs = [ ClassMix ]; }; CryptIDEA = buildPerlPackage { - name = "Crypt-IDEA-1.10"; + pname = "Crypt-IDEA"; + version = "1.10"; src = fetchurl { url = mirror://cpan/authors/id/D/DP/DPARIS/Crypt-IDEA-1.10.tar.gz; sha256 = "0690lzlyjqgmnb94dq7dm5n6pgybg10fkpgfycgzr814370pig9k"; }; }; - CryptJWT = buildPerlPackage rec { - name = "Crypt-JWT-0.024"; + CryptJWT = buildPerlPackage { + pname = "Crypt-JWT"; + version = "0.024"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.024.tar.gz; sha256 = "4fcb81992fa61c0dbeb7c3582e887a92746aca76a42609091d986350e91892c5"; }; propagatedBuildInputs = [ CryptX JSONMaybeXS ]; @@ -2961,7 +3187,8 @@ let }; CryptPasswdMD5 = buildPerlModule { - name = "Crypt-PasswdMD5-1.40"; + pname = "Crypt-PasswdMD5"; + version = "1.40"; src = fetchurl { url = mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-1.40.tgz; sha256 = "0j0r74f18nk63phddzqbf7wqma2ci4p4bxvrwrxsy0aklbp6lzdp"; @@ -2969,7 +3196,8 @@ let }; CryptPKCS10 = buildPerlModule { - name = "Crypt-PKCS10-2.001"; + pname = "Crypt-PKCS10"; + version = "2.001"; src = fetchurl { url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-PKCS10-2.001.tar.gz; sha256 = "f7945b76a2d8f4d8ecf627b2eb8ea4f41d001e6a915efe82e71d6b97fea3ffa9"; @@ -2982,7 +3210,8 @@ let }; CryptRandomSource = buildPerlModule { - name = "Crypt-Random-Source-0.14"; + pname = "Crypt-Random-Source"; + version = "0.14"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Crypt-Random-Source-0.14.tar.gz; sha256 = "1rpdds3sy5l1fhngnkrsgwsmwd54wpicx3i9ds69blcskwkcwkpc"; @@ -2995,59 +3224,66 @@ let }; }; - CryptRC4 = buildPerlPackage rec { - name = "Crypt-RC4-2.02"; + CryptRC4 = buildPerlPackage { + pname = "Crypt-RC4"; + version = "2.02"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SI/SIFUKURT/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SI/SIFUKURT/Crypt-RC4-2.02.tar.gz; sha256 = "1sp099cws0q225h6j4y68hmfd1lnv5877gihjs40f8n2ddf45i2y"; }; }; CryptRandPasswd = buildPerlPackage { - name = "Crypt-RandPasswd-0.06"; + pname = "Crypt-RandPasswd"; + version = "0.06"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEILB/Crypt-RandPasswd-0.06.tar.gz; sha256 = "0ca8544371wp4vvqsa19lnhl02hczpkbwkgsgm65ziwwim3r1gdi"; }; }; - CryptMySQL = buildPerlModule rec { - name = "Crypt-MySQL-0.04"; + CryptMySQL = buildPerlModule { + pname = "Crypt-MySQL"; + version = "0.04"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IK/IKEBE/${name}.tar.gz"; + url = mirror://cpan/authors/id/I/IK/IKEBE/Crypt-MySQL-0.04.tar.gz; sha256 = "93ebdfaaefcfe9ab683f0121c85f24475d8197f0bcec46018219e4111434dde3"; }; propagatedBuildInputs = [ DigestSHA1 ]; }; - CryptRijndael = buildPerlPackage rec { - name = "Crypt-Rijndael-1.13"; + CryptRijndael = buildPerlPackage { + pname = "Crypt-Rijndael"; + version = "1.13"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; + url = mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.14.tar.gz; sha256 = "0ki16vkgzvzyjdx6mmvjfpngyvhf7cis46pymy6dr8z0vyk0jwnd"; }; }; - CryptUnixCryptXS = buildPerlPackage rec { - name = "Crypt-UnixCrypt_XS-0.11"; + CryptUnixCryptXS = buildPerlPackage { + pname = "Crypt-UnixCrypt_XS"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BORISZ/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BO/BORISZ/Crypt-UnixCrypt_XS-0.11.tar.gz; sha256 = "1ajg3x6kwxy4x9p3nw1j36qjxpjvdpi9wkca5gfd86y9q8939sv2"; }; }; - CryptSmbHash = buildPerlPackage rec { - name = "Crypt-SmbHash-0.12"; + CryptSmbHash = buildPerlPackage { + pname = "Crypt-SmbHash"; + version = "0.12"; src = fetchurl { url = "mirror://cpan/authors/id/B/BJ/BJKUIT/Crypt-SmbHash-0.12.tar.gz"; sha256 = "0dxivcqmabkhpz5xzph6rzl8fvq9xjy26b2ci77pv5gsmdzari38"; }; }; - CryptOpenSSLAES = buildPerlPackage rec { - name = "Crypt-OpenSSL-AES-0.02"; + CryptOpenSSLAES = buildPerlPackage { + pname = "Crypt-OpenSSL-AES"; + version = "0.02"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TT/TTAR/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TT/TTAR/Crypt-OpenSSL-AES-0.02.tar.gz; sha256 = "b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; @@ -3058,8 +3294,9 @@ let }; }; - CryptOpenSSLBignum = buildPerlPackage rec { - name = "Crypt-OpenSSL-Bignum-0.09"; + CryptOpenSSLBignum = buildPerlPackage { + pname = "Crypt-OpenSSL-Bignum"; + version = "0.09"; src = fetchurl { url = mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-Bignum-0.09.tar.gz; sha256 = "1p22znbajq91lbk2k3yg12ig7hy5b4vy8igxwqkmbm4nhgxp4ki3"; @@ -3068,8 +3305,9 @@ let NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; }; - CryptOpenSSLGuess = buildPerlPackage rec { - name = "Crypt-OpenSSL-Guess-0.11"; + CryptOpenSSLGuess = buildPerlPackage { + pname = "Crypt-OpenSSL-Guess"; + version = "0.11"; src = fetchurl { url = mirror://cpan/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-0.11.tar.gz; sha256 = "0rvi9l4ljcbhwwvspq019nfq2h2v746dk355h2nwnlmqikiihsxa"; @@ -3081,10 +3319,11 @@ let }; }; - CryptOpenSSLRandom = buildPerlPackage rec { - name = "Crypt-OpenSSL-Random-0.15"; + CryptOpenSSLRandom = buildPerlPackage { + pname = "Crypt-OpenSSL-Random"; + version = "0.15"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RU/RURBAN/Crypt-OpenSSL-Random-0.15.tar.gz; sha256 = "1x6ffps8q7mnawmcfq740llzy7i10g3319vap0wiw4d33fm6z1zh"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; @@ -3092,8 +3331,9 @@ let buildInputs = [ CryptOpenSSLGuess ]; }; - CryptOpenSSLRSA = buildPerlPackage rec { - name = "Crypt-OpenSSL-RSA-0.31"; + CryptOpenSSLRSA = buildPerlPackage { + pname = "Crypt-OpenSSL-RSA"; + version = "0.31"; src = fetchurl { url = mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.31.tar.gz; sha256 = "4173403ad4cf76732192099f833fbfbf3cd8104e0246b3844187ae384d2c5436"; @@ -3104,10 +3344,11 @@ let buildInputs = [ CryptOpenSSLGuess ]; }; - CryptEd25519 = buildPerlPackage rec { - name = "Crypt-Ed25519-1.04"; + CryptEd25519 = buildPerlPackage { + pname = "Crypt-Ed25519"; + version = "1.04"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Crypt-Ed25519-1.04.tar.gz; sha256 = "1jwh6b8b2ppvzxaljz287zakj4q3ip4zq121i23iwh26wxhlll2q"; }; @@ -3121,10 +3362,11 @@ let buildInputs = [ CanaryStability ]; }; - CryptSSLeay = buildPerlPackage rec { - name = "Crypt-SSLeay-0.72"; + CryptSSLeay = buildPerlPackage { + pname = "Crypt-SSLeay"; + version = "0.72"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NA/NANIS/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.72.tar.gz; sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm"; }; makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl.dev}/include"; @@ -3132,17 +3374,19 @@ let propagatedBuildInputs = [ LWPProtocolHttps ]; }; - CSSDOM = buildPerlPackage rec { - name = "CSS-DOM-0.17"; + CSSDOM = buildPerlPackage { + pname = "CSS-DOM"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SP/SPROUT/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SP/SPROUT/CSS-DOM-0.17.tar.gz; sha256 = "09phb6c9czpcp9imq06khm54kspsx6hnvfrjxramx663ygmpifb5"; }; propagatedBuildInputs = [ Clone ]; }; - CSSMinifierXP = buildPerlModule rec { - name = "CSS-Minifier-XS-0.09"; + CSSMinifierXP = buildPerlModule { + pname = "CSS-Minifier-XS"; + version = "0.09"; src = fetchurl { url = mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz; sha256 = "1myswrmh0sqp5xjpp03x45z8arfmgkjx0srl3r6kjsyzl1zrk9l8"; @@ -3154,7 +3398,8 @@ let }; CSSSquish = buildPerlPackage { - name = "CSS-Squish-0.10"; + pname = "CSS-Squish"; + version = "0.10"; src = fetchurl { url = mirror://cpan/authors/id/T/TS/TSIBLEY/CSS-Squish-0.10.tar.gz; sha256 = "65fc0d69acd1fa33d9a4c3b09cce0fbd737d747b1fcc4e9d87ebd91050cbcb4e"; @@ -3166,25 +3411,26 @@ let }; }; - Curses = let version = "1.36"; in buildPerlPackage { - name = "Curses-${version}"; + Curses = buildPerlPackage { + pname = "Curses"; + version = "1.36"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-${version}.tar.gz"; + url = "mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.36.tar.gz"; sha256 = "0r6xd9wr0c25rr28zixhqipak575zqsfb7r7f2693i9il1dpj554"; }; propagatedBuildInputs = [ pkgs.ncurses ]; NIX_CFLAGS_LINK = "-lncurses"; meta = { - inherit version; description = "Perl bindings to ncurses"; license = stdenv.lib.licenses.artistic1; }; }; - CursesUI = buildPerlPackage rec { - name = "Curses-UI-0.9609"; + CursesUI = buildPerlPackage { + pname = "Curses-UI"; + version = "0.9609"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MD/MDXI/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MD/MDXI/Curses-UI-0.9609.tar.gz; sha256 = "1bqf4h8z70f78nzqq5yj4ahvsbhxxal6bc2g301l9qdn2fjjgf0a"; }; meta = { @@ -3194,10 +3440,11 @@ let propagatedBuildInputs = [ Curses TermReadKey ]; }; - CryptX = buildPerlPackage rec { - name = "CryptX-0.063"; + CryptX = buildPerlPackage { + pname = "CryptX"; + version = "0.063"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIK/CryptX-0.063.tar.gz; sha256 = "6cfc672e0e56d56cf849caf0b929ed94f87cb4e6be5c20757ca3d3dbe5569595"; }; meta = { @@ -3206,10 +3453,11 @@ let }; }; - CwdGuard = buildPerlModule rec { - name = "Cwd-Guard-0.05"; + CwdGuard = buildPerlModule { + pname = "Cwd-Guard"; + version = "0.05"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KA/KAZEBURO/Cwd-Guard-0.05.tar.gz; sha256 = "0xwf4rmii55k3lp19mpbh00mbgby7rxdk2lk84148bjhp6i7rz3s"; }; meta = { @@ -3220,7 +3468,8 @@ let }; DataClone = buildPerlPackage { - name = "Data-Clone-0.004"; + pname = "Data-Clone"; + version = "0.004"; src = fetchurl { url = mirror://cpan/authors/id/G/GF/GFUJI/Data-Clone-0.004.tar.gz; sha256 = "0g1qhi5qyk4fp0pwyaw90vxiyyn8las0i8ghzrnr4srai1wy3r9g"; @@ -3232,19 +3481,21 @@ let }; }; - DataCompare = buildPerlPackage rec { - name = "Data-Compare-1.25"; + DataCompare = buildPerlPackage { + pname = "Data-Compare"; + version = "1.25"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCANTRELL/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Compare-1.25.tar.gz; sha256 = "0wzasidg9yjcfsi2gdiaw6726ikqda7n24n0v2ngpaazakdkcjqx"; }; propagatedBuildInputs = [ FileFindRule ]; }; - DataDump = buildPerlPackage rec { - name = "Data-Dump-1.23"; + DataDump = buildPerlPackage { + pname = "Data-Dump"; + version = "1.23"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.23.tar.gz; sha256 = "0r9ba52b7p8nnn6nw0ygm06lygi8g68piri78jmlqyrqy5gb0lxg"; }; meta = { @@ -3253,8 +3504,9 @@ let }; }; - DataDumper = buildPerlPackage rec { - name = "Data-Dumper-2.173"; + DataDumper = buildPerlPackage { + pname = "Data-Dumper"; + version = "2.173"; src = fetchurl { url = mirror://cpan/authors/id/X/XS/XSAWYERX/Data-Dumper-2.173.tar.gz; sha256 = "697608b39330988e519131be667ff47168aaaaf99f06bd2095d5b46ad05d76fa"; @@ -3265,10 +3517,11 @@ let }; }; - DataDumperConcise = buildPerlPackage rec { - name = "Data-Dumper-Concise-2.023"; + DataDumperConcise = buildPerlPackage { + pname = "Data-Dumper-Concise"; + version = "2.023"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/Data-Dumper-Concise-2.023.tar.gz; sha256 = "a6c22f113caf31137590def1b7028a7e718eface3228272d0672c25e035d5853"; }; meta = { @@ -3277,27 +3530,30 @@ let }; }; - DataEntropy = buildPerlModule rec { - name = "Data-Entropy-0.007"; + DataEntropy = buildPerlModule { + pname = "Data-Entropy"; + version = "0.007"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Entropy-0.007.tar.gz; sha256 = "2611c4a1a3038594d79ea4ed14d9e15a9af8f77105f51667795fe4f8a53427e4"; }; propagatedBuildInputs = [ CryptRijndael DataFloat HTTPLite ParamsClassify ]; }; - DataFloat = buildPerlModule rec { - name = "Data-Float-0.013"; + DataFloat = buildPerlModule { + pname = "Data-Float"; + version = "0.013"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Float-0.013.tar.gz; sha256 = "e2b1523d858930b8bbdbd196f08235f5e678b84919ba87712e26313b9c27518a"; }; }; - DataFormValidator = buildPerlPackage rec { - name = "Data-FormValidator-4.88"; + DataFormValidator = buildPerlPackage { + pname = "Data-FormValidator"; + version = "4.88"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DF/DFARRELL/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DF/DFARRELL/Data-FormValidator-4.88.tar.gz; sha256 = "c1a539f91c92cbcd8a8d83597ec9a7643fcd8ccf5a94e15382c3765289170066"; }; propagatedBuildInputs = [ DateCalc EmailValid FileMMagic ImageSize MIMETypes RegexpCommon ]; @@ -3308,10 +3564,11 @@ let buildInputs = [ CGI ]; }; - DataGUID = buildPerlPackage rec { - name = "Data-GUID-0.049"; + DataGUID = buildPerlPackage { + pname = "Data-GUID"; + version = "0.049"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Data-GUID-0.049.tar.gz; sha256 = "0yx7d4qwsr9n85gslip0y3mdwr5fkncfbwxz7si2a17x95yl7bxq"; }; propagatedBuildInputs = [ DataUUID SubExporter ]; @@ -3323,7 +3580,8 @@ let }; DataHexDump = buildPerlPackage { - name = "Data-HexDump-0.02"; + pname = "Data-HexDump"; + version = "0.02"; src = fetchurl { url = mirror://cpan/authors/id/F/FT/FTASSIN/Data-HexDump-0.02.tar.gz; sha256 = "1a9d843e7f667c1c6f77c67af5d77e7462ff23b41937cb17454d03535cd9be70"; @@ -3334,10 +3592,11 @@ let }; }; - DataHexdumper = buildPerlPackage rec { - name = "Data-Hexdumper-3.0001"; + DataHexdumper = buildPerlPackage { + pname = "Data-Hexdumper"; + version = "3.0001"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCANTRELL/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Hexdumper-3.0001.tar.gz; sha256 = "f9243cbe8affed5045fe4df505726a7a7289471e30c51ac065b3ed6ce0d1a604"; }; meta = { @@ -3347,7 +3606,8 @@ let }; DataHierarchy = buildPerlPackage { - name = "Data-Hierarchy-0.34"; + pname = "Data-Hierarchy"; + version = "0.34"; src = fetchurl { url = mirror://cpan/authors/id/C/CL/CLKAO/Data-Hierarchy-0.34.tar.gz; sha256 = "1vfrkygdaq0k7006i83jwavg9wgszfcyzbl9b7fp37z2acmyda5k"; @@ -3356,7 +3616,8 @@ let }; DataICal = buildPerlPackage { - name = "Data-ICal-0.22"; + pname = "Data-ICal"; + version = "0.22"; src = fetchurl { url = mirror://cpan/authors/id/A/AL/ALEXMV/Data-ICal-0.22.tar.gz; sha256 = "8ae9d20af244e5a6f606c7325e9d145dd0002676a178357af860a5e156925720"; @@ -3370,7 +3631,8 @@ let }; DataIEEE754 = buildPerlPackage { - name = "Data-IEEE754-0.02"; + pname = "Data-IEEE754"; + version = "0.02"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MAXMIND/Data-IEEE754-0.02.tar.gz; sha256 = "07b73dlxd0qmxgkkrpa2xr61y18v3adlf1qgnl9k90kj8q9spx66"; @@ -3382,16 +3644,18 @@ let }; }; - DataInteger = buildPerlModule rec { - name = "Data-Integer-0.006"; + DataInteger = buildPerlModule { + pname = "Data-Integer"; + version = "0.006"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Integer-0.006.tar.gz; sha256 = "0m53zxhx9sn49yqh7azlpyy9m65g54v8cd2ha98y77337gg7xdv3"; }; }; DataOptList = buildPerlPackage { - name = "Data-OptList-0.110"; + pname = "Data-OptList"; + version = "0.110"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.110.tar.gz; sha256 = "1hzmgr2imdg1fc3hmwx0d56fhsdfyrgmgx7jb4jkyiv6575ifq9n"; @@ -3404,8 +3668,9 @@ let }; }; - DataPage = buildPerlModule { - name = "Data-Page-2.02"; + DataPage = buildPerlPackage { + pname = "Data-Page"; + version = "2.02"; src = fetchurl { url = mirror://cpan/authors/id/L/LB/LBROCARD/Data-Page-2.02.tar.gz; sha256 = "1hvi92c4h2angryc6pngw7gbm3ysc2jfmyxk2wh9ia4vdwpbs554"; @@ -3414,8 +3679,9 @@ let buildInputs = [ TestException ]; }; - DataPagePageset = buildPerlModule rec { - name = "Data-Page-Pageset-1.02"; + DataPagePageset = buildPerlModule { + pname = "Data-Page-Pageset"; + version = "1.02"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHUNZI/Data-Page-Pageset-1.02.tar.gz; sha256 = "142isi8la383dbjxj7lfgcbmmrpzwckcc4wma6rdl8ryajsipb6f"; @@ -3428,17 +3694,19 @@ let }; DataPassword = buildPerlPackage { - name = "Data-Password-1.12"; + pname = "Data-Password"; + version = "1.12"; src = fetchurl { url = mirror://cpan/authors/id/R/RA/RAZINF/Data-Password-1.12.tar.gz; sha256 = "830cde81741ff384385412e16faba55745a54a7cc019dd23d7ed4f05d551a961"; }; }; - DataPerl = buildPerlPackage rec { - name = "Data-Perl-0.002009"; + DataPerl = buildPerlPackage { + pname = "Data-Perl"; + version = "0.002009"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MATTP/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MATTP/Data-Perl-0.002009.tar.gz; sha256 = "b62b2225870c2c3b16fb78c429f8729ddb8ed0e342f4209ec3c261b764c36f8b"; }; buildInputs = [ TestDeep TestFatal TestOutput ]; @@ -3451,7 +3719,8 @@ let }; DataPrinter = buildPerlPackage { - name = "Data-Printer-0.40"; + pname = "Data-Printer"; + version = "0.40"; src = fetchurl { url = mirror://cpan/authors/id/G/GA/GARU/Data-Printer-0.40.tar.gz; sha256 = "0njjh8zp5afc4602jrnmg89icj7gfsil6i955ypcqxc2gl830sb0"; @@ -3463,10 +3732,11 @@ let }; }; - DataSection = buildPerlPackage rec { - name = "Data-Section-0.200007"; + DataSection = buildPerlPackage { + pname = "Data-Section"; + version = "0.200007"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Data-Section-0.200007.tar.gz; sha256 = "1pmlxca0a8sv2jjwvhwgqavq6iwys6kf457lby4anjp3f1dpx4yd"; }; propagatedBuildInputs = [ MROCompat SubExporter ]; @@ -3479,7 +3749,8 @@ let }; DataSerializer = buildPerlModule { - name = "Data-Serializer-0.60"; + pname = "Data-Serializer"; + version = "0.60"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.60.tar.gz; sha256 = "0ca4s811l7f2bqkx7vnyxbpp4f0qska89g2pvsfb3k0bhhbk0jdk"; @@ -3491,7 +3762,8 @@ let }; DataSpreadPagination = buildPerlPackage { - name = "Data-SpreadPagination-0.1.2"; + pname = "Data-SpreadPagination"; + version = "0.1.2"; src = fetchurl { url = mirror://cpan/authors/id/K/KN/KNEW/Data-SpreadPagination-0.1.2.tar.gz; sha256 = "74ebfd847132c38cc9e835e14e82c43f1809a95cbc98bb84d1f7ce2e4ef487e3"; @@ -3503,7 +3775,8 @@ let }; DataStreamBulk = buildPerlPackage { - name = "Data-Stream-Bulk-0.11"; + pname = "Data-Stream-Bulk"; + version = "0.11"; src = fetchurl { url = mirror://cpan/authors/id/D/DO/DOY/Data-Stream-Bulk-0.11.tar.gz; sha256 = "06e08432a6b97705606c925709b99129ad926516e477d58e4461e4b3d9f30917"; @@ -3516,10 +3789,11 @@ let }; }; - DataStructureUtil = buildPerlPackage rec { - name = "Data-Structure-Util-0.16"; + DataStructureUtil = buildPerlPackage { + pname = "Data-Structure-Util"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AN/ANDYA/Data-Structure-Util-0.16.tar.gz; sha256 = "9cd42a13e65cb15f3a76296eb9a134da220168ec747c568d331a50ae7a2ddbc6"; }; buildInputs = [ TestPod ]; @@ -3530,7 +3804,8 @@ let }; DataTaxi = buildPerlPackage { - name = "Data-Taxi-0.96"; + pname = "Data-Taxi"; + version = "0.96"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIKO/Data-Taxi-0.96.tar.gz; sha256 = "0y4wls4jlwd6prvd77szymddhq9sfj06kaqnk4frlvd0zh83djxb"; @@ -3538,18 +3813,20 @@ let buildInputs = [ DebugShowStuff ]; }; - DataUniqid = buildPerlPackage rec { - name = "Data-Uniqid-0.12"; + DataUniqid = buildPerlPackage { + pname = "Data-Uniqid"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MW/MWX/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MW/MWX/Data-Uniqid-0.12.tar.gz; sha256 = "b6919ba49b9fe98bfdf3e8accae7b9b7f78dc9e71ebbd0b7fef7a45d99324ccb"; }; }; - DataURIEncode = buildPerlPackage rec { - name = "Data-URIEncode-0.11"; + DataURIEncode = buildPerlPackage { + pname = "Data-URIEncode"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RH/RHANDOM/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RH/RHANDOM/Data-URIEncode-0.11.tar.gz; sha256 = "51c9efbf8423853616eaa24841e4d1996b2db0036900617fb1dbc76c75a1f360"; }; meta = { @@ -3557,8 +3834,9 @@ let }; }; - DataUUID = buildPerlPackage rec { - name = "Data-UUID-1.224"; + DataUUID = buildPerlPackage { + pname = "Data-UUID"; + version = "1.224"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.224.tar.gz; sha256 = "0z7l3fc710v830n1krgrp7wzfispi5s0h10cyk65xvxv09sw2n69"; @@ -3566,7 +3844,8 @@ let }; DataUUIDMT = buildPerlPackage { - name = "Data-UUID-MT-1.001"; + pname = "Data-UUID-MT"; + version = "1.001"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Data-UUID-MT-1.001.tar.gz; sha256 = "0bb7qibq1c5lhaihxa1sck9pb744p8c7172jgx5zh4c32ac4nk1h"; @@ -3579,10 +3858,11 @@ let }; }; - DataValidateDomain = buildPerlPackage rec { - name = "Data-Validate-Domain-0.14"; + DataValidateDomain = buildPerlPackage { + pname = "Data-Validate-Domain"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-Domain-0.14.tar.gz; sha256 = "4470f253b8d2720a4dd3fa3ae550995417c2269f3be7ff030e01afa04a3a9421"; }; buildInputs = [ Test2Suite ]; @@ -3593,10 +3873,11 @@ let }; }; - DataValidateIP = buildPerlPackage rec { - name = "Data-Validate-IP-0.27"; + DataValidateIP = buildPerlPackage { + pname = "Data-Validate-IP"; + version = "0.27"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-IP-0.27.tar.gz; sha256 = "e1aa92235dcb9c6fd9b6c8cda184d1af73537cc77f4f83a0f88207a8bfbfb7d6"; }; buildInputs = [ TestRequires ]; @@ -3607,10 +3888,11 @@ let }; }; - DataValidateURI = buildPerlPackage rec { - name = "Data-Validate-URI-0.07"; + DataValidateURI = buildPerlPackage { + pname = "Data-Validate-URI"; + version = "0.07"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SO/SONNEN/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SO/SONNEN/Data-Validate-URI-0.07.tar.gz; sha256 = "f06418d2a4603913d1b6ce52b167dd13e787e13bf2be325a065df7d408f79c60"; }; propagatedBuildInputs = [ DataValidateDomain DataValidateIP ]; @@ -3620,10 +3902,11 @@ let }; }; - DataVisitor = buildPerlPackage rec { - name = "Data-Visitor-0.30"; + DataVisitor = buildPerlPackage { + pname = "Data-Visitor"; + version = "0.30"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DO/DOY/Data-Visitor-0.30.tar.gz; sha256 = "0m7d1505af9z2hj5aw020grcmjjlvnkjpvjam457d7k5qfy4m8lf"; }; buildInputs = [ TestRequires ]; @@ -3631,7 +3914,8 @@ let }; DateCalc = buildPerlPackage { - name = "Date-Calc-6.4"; + pname = "Date-Calc"; + version = "6.4"; src = fetchurl { url = mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-6.4.tar.gz; sha256 = "1barz0jgdaan3jm7ciphs5n3ahwkl42imprs3y8c1dwpwyr3gqbw"; @@ -3641,7 +3925,8 @@ let }; DateExtract = buildPerlPackage { - name = "Date-Extract-0.06"; + pname = "Date-Extract"; + version = "0.06"; src = fetchurl { url = mirror://cpan/authors/id/A/AL/ALEXMV/Date-Extract-0.06.tar.gz; sha256 = "bc7658d5c50c3525ec0efcb55236a5de2d5d4fc06fc147fa3929c8f0953cda2b"; @@ -3650,10 +3935,11 @@ let propagatedBuildInputs = [ DateTimeFormatNatural ]; }; - DateManip = buildPerlPackage rec { - name = "Date-Manip-6.76"; + DateManip = buildPerlPackage { + pname = "Date-Manip"; + version = "6.76"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SB/SBECK/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.76.tar.gz; sha256 = "1a33mpkx7qqb9nqxyh2kkb596d8xq6jw0ljrd4xrwiz30f6cg1qw"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work @@ -3668,7 +3954,8 @@ let }; DateSimple = buildPerlPackage { - name = "Date-Simple-3.03"; + pname = "Date-Simple"; + version = "3.03"; src = fetchurl { url = mirror://cpan/authors/id/I/IZ/IZUT/Date-Simple-3.03.tar.gz; sha256 = "29a1926314ce1681a312d6155c29590c771ddacf91b7485873ce449ef209dd04"; @@ -3678,10 +3965,11 @@ let }; }; - DateTime = buildPerlPackage rec { - name = "DateTime-1.50"; + DateTime = buildPerlPackage { + pname = "DateTime"; + version = "1.50"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.50.tar.gz; sha256 = "165iqk1xvhs5j0kzsipa7aqycx3h37wqsl2r4jl104yqvmqhqszd"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; @@ -3692,8 +3980,9 @@ let }; }; - DateTimeCalendarJulian = buildPerlPackage rec { - name = "DateTime-Calendar-Julian-0.100"; + DateTimeCalendarJulian = buildPerlPackage { + pname = "DateTime-Calendar-Julian"; + version = "0.100"; src = fetchurl { url = mirror://cpan/authors/id/W/WY/WYANT/DateTime-Calendar-Julian-0.100.tar.gz; sha256 = "0gbw7rh706qk5jlmmz3yzsm0ilzp39kyar28g4j6d57my8cwaipx"; @@ -3705,10 +3994,11 @@ let propagatedBuildInputs = [ DateTime ]; }; - DateTimeEventICal = buildPerlPackage rec { - name = "DateTime-Event-ICal-0.13"; + DateTimeEventICal = buildPerlPackage { + pname = "DateTime-Event-ICal"; + version = "0.13"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FG/FGLOCK/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-ICal-0.13.tar.gz; sha256 = "1skmykxbrf98ldi72d5s1v6228gfdr5iy4y0gpl0xwswxy247njk"; }; propagatedBuildInputs = [ DateTimeEventRecurrence ]; @@ -3719,7 +4009,8 @@ let }; DateTimeEventRecurrence = buildPerlPackage { - name = "DateTime-Event-Recurrence-0.19"; + pname = "DateTime-Event-Recurrence"; + version = "0.19"; src = fetchurl { url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-Recurrence-0.19.tar.gz; sha256 = "f9408789a461107766ca1a232bb3ec1e702eec7ca8167401ea6ec3f4b6d0b5a5"; @@ -3728,7 +4019,8 @@ let }; DateTimeFormatBuilder = buildPerlPackage { - name = "DateTime-Format-Builder-0.82"; + pname = "DateTime-Format-Builder"; + version = "0.82"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.82.tar.gz; sha256 = "383faeb22b992c77ca65a5257992dd2f6db91a7db73ea4601c512e1c6c2e1ca3"; @@ -3741,7 +4033,8 @@ let }; DateTimeFormatDateParse = buildPerlModule { - name = "DateTime-Format-DateParse-0.05"; + pname = "DateTime-Format-DateParse"; + version = "0.05"; src = fetchurl { url = mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-DateParse-0.05.tar.gz; sha256 = "f6eca4c8be66ce9992ee150932f8fcf07809fd3d1664caf200b8a5fd3a7e5ebc"; @@ -3754,7 +4047,8 @@ let }; DateTimeFormatFlexible = buildPerlPackage { - name = "DateTime-Format-Flexible-0.31"; + pname = "DateTime-Format-Flexible"; + version = "0.31"; src = fetchurl { url = mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.31.tar.gz; sha256 = "0daf62fe4af0b336d45e367143a580b5a34912a679eef788d54c4d5ad685c2d1"; @@ -3767,10 +4061,11 @@ let buildInputs = [ TestException TestMockTime TestNoWarnings ]; }; - DateTimeFormatHTTP = buildPerlModule rec { - name = "DateTime-Format-HTTP-0.42"; + DateTimeFormatHTTP = buildPerlModule { + pname = "DateTime-Format-HTTP"; + version = "0.42"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CK/CKRAS/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CK/CKRAS/DateTime-Format-HTTP-0.42.tar.gz; sha256 = "0h6qqdg1yzqkdxp7hqlp0qa7d1y64nilgimxs79dys2ryjfpcknh"; }; propagatedBuildInputs = [ DateTime HTTPDate ]; @@ -3781,7 +4076,8 @@ let }; DateTimeFormatICal = buildPerlModule { - name = "DateTime-Format-ICal-0.09"; + pname = "DateTime-Format-ICal"; + version = "0.09"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ICal-0.09.tar.gz; sha256 = "8b09f6539f5e9c0df0e6135031699ed4ef9eef8165fc80aefeecc817ef997c33"; @@ -3794,7 +4090,8 @@ let }; DateTimeFormatISO8601 = buildPerlModule { - name = "DateTime-Format-ISO8601-0.08"; + pname = "DateTime-Format-ISO8601"; + version = "0.08"; src = fetchurl { url = mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-0.08.tar.gz; sha256 = "1syccqd5jlwms8v78ksnf68xijzl97jky5vbwhnyhxi5gvgfx8xk"; @@ -3807,7 +4104,8 @@ let }; DateTimeFormatMail = buildPerlPackage { - name = "DateTime-Format-Mail-0.403"; + pname = "DateTime-Format-Mail"; + version = "0.403"; src = fetchurl { url = mirror://cpan/authors/id/B/BO/BOOK/DateTime-Format-Mail-0.403.tar.gz; sha256 = "8df8e35c4477388ff5c7ce8b3e8b6ae4ed30209c7a5051d41737bd14d755fcb0"; @@ -3820,7 +4118,8 @@ let }; DateTimeFormatNatural = buildPerlModule { - name = "DateTime-Format-Natural-1.07"; + pname = "DateTime-Format-Natural"; + version = "1.07"; src = fetchurl { url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.07.tar.gz; sha256 = "1df12c7bf1nchaniak1rd2x18mckp4ymc0bgkbnvphhd1p08bzvx"; @@ -3833,10 +4132,11 @@ let }; }; - DateTimeFormatMySQL = buildPerlModule rec { - name = "DateTime-Format-MySQL-0.06"; + DateTimeFormatMySQL = buildPerlModule { + pname = "DateTime-Format-MySQL"; + version = "0.06"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XM/XMIKEW/${name}.tar.gz"; + url = mirror://cpan/authors/id/X/XM/XMIKEW/DateTime-Format-MySQL-0.06.tar.gz; sha256 = "07cgz60gxvrv7xqvngyll60pa8cx93h3jyx9kc9wdkn95qbd864q"; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; @@ -3847,7 +4147,8 @@ let }; DateTimeFormatPg = buildPerlModule { - name = "DateTime-Format-Pg-0.16013"; + pname = "DateTime-Format-Pg"; + version = "0.16013"; src = fetchurl { url = mirror://cpan/authors/id/D/DM/DMAKI/DateTime-Format-Pg-0.16013.tar.gz; sha256 = "16siw0f3a0ilzv5fnfas5s9n92drjy271yf6qvmmpm0vwnjjx1kz"; @@ -3860,10 +4161,11 @@ let buildInputs = [ ModuleBuildTiny ]; }; - DateTimeFormatStrptime = buildPerlPackage rec { - name = "DateTime-Format-Strptime-1.76"; + DateTimeFormatStrptime = buildPerlPackage { + pname = "DateTime-Format-Strptime"; + version = "1.76"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.76.tar.gz; sha256 = "593c26466ed7a3d2cefe9215f1619666c5116bd3a551e0aa74b64a6353fcb50d"; }; buildInputs = [ TestFatal TestWarnings ]; @@ -3874,10 +4176,11 @@ let }; }; - DateTimeFormatSQLite = buildPerlPackage rec { - name = "DateTime-Format-SQLite-0.11"; + DateTimeFormatSQLite = buildPerlPackage { + pname = "DateTime-Format-SQLite"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CF/CFAERBER/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CF/CFAERBER/DateTime-Format-SQLite-0.11.tar.gz; sha256 = "cc1f4e0ae1d39b0d4c3dddccfd7423c77c67a70950c4b5ecabf8ca553ab294b4"; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; @@ -3888,7 +4191,8 @@ let }; DateTimeFormatW3CDTF = buildPerlPackage { - name = "DateTime-Format-W3CDTF-0.07"; + pname = "DateTime-Format-W3CDTF"; + version = "0.07"; src = fetchurl { url = mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.07.tar.gz; sha256 = "69a02b661bbf1daa14a4813cb6786eaa66dbdf2743f0b3f458e30234c3a26268"; @@ -3900,10 +4204,11 @@ let }; }; - DateTimeLocale = buildPerlPackage rec { - name = "DateTime-Locale-1.24"; + DateTimeLocale = buildPerlPackage { + pname = "DateTime-Locale"; + version = "1.24"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.24.tar.gz; sha256 = "d03aaa33126a13b1fe6591b9838f0a07395f1fea12b6e304566d7e39a5e5fb82"; }; buildInputs = [ CPANMetaCheck FileShareDirInstall IPCSystemSimple TestFatal TestFileShareDir TestRequires TestWarnings ]; @@ -3914,10 +4219,11 @@ let }; }; - DateTimeSet = buildPerlModule rec { - name = "DateTime-Set-0.3900"; + DateTimeSet = buildPerlModule { + pname = "DateTime-Set"; + version = "0.3900"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FG/FGLOCK/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Set-0.3900.tar.gz; sha256 = "94f41c3924aafde4ef7fa6b58e0595d4038d8ac5ffd62ba111b13c5f4dbc0946"; }; propagatedBuildInputs = [ DateTime ParamsValidate SetInfinite ]; @@ -3927,10 +4233,11 @@ let }; }; - DateTimeTimeZone = buildPerlPackage rec { - name = "DateTime-TimeZone-2.34"; + DateTimeTimeZone = buildPerlPackage { + pname = "DateTime-TimeZone"; + version = "2.34"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.34.tar.gz; sha256 = "dee1111c06f2aa705f803bc4f3d93b50df566d864a1a8bf31b55dfaf2b3de809"; }; buildInputs = [ TestFatal TestRequires ]; @@ -3942,7 +4249,8 @@ let }; DateTimeXEasy = buildPerlPackage { - name = "DateTimeX-Easy-0.089"; + pname = "DateTimeX-Easy"; + version = "0.089"; src = fetchurl { url = mirror://cpan/authors/id/R/RO/ROKR/DateTimeX-Easy-0.089.tar.gz; sha256 = "17e6d202e7ac6049523048e97bb8f195e3c79208570da1504f4313584e487a79"; @@ -3957,7 +4265,8 @@ let }; DebugShowStuff = buildPerlModule { - name = "Debug-ShowStuff-1.16"; + pname = "Debug-ShowStuff"; + version = "1.16"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIKO/Debug-ShowStuff-1.16.tar.gz; sha256 = "1drcrnji3yrd0s3xb69bxnqa51s19c13w68vhvjad3nvswn5vpd4"; @@ -3970,7 +4279,8 @@ let }; DevelCaller = buildPerlPackage { - name = "Devel-Caller-2.06"; + pname = "Devel-Caller"; + version = "2.06"; src = fetchurl { url = mirror://cpan/authors/id/R/RC/RCLAMP/Devel-Caller-2.06.tar.gz; sha256 = "1pxpimifzmnjnvf4icclx77myc15ahh0k56sj1djad1855mawwva"; @@ -3982,8 +4292,9 @@ let }; }; - DevelCheckBin = buildPerlPackage rec { - name = "Devel-CheckBin-0.04"; + DevelCheckBin = buildPerlPackage { + pname = "Devel-CheckBin"; + version = "0.04"; src = fetchurl { url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Devel-CheckBin-0.04.tar.gz; sha256 = "1r735yzgvsxkj4m6ks34xva5m21cfzp9qiis2d4ivv99kjskszqm"; @@ -3995,8 +4306,9 @@ let }; }; - DevelCheckCompiler = buildPerlModule rec { - name = "Devel-CheckCompiler-0.07"; + DevelCheckCompiler = buildPerlModule { + pname = "Devel-CheckCompiler"; + version = "0.07"; src = fetchurl { url = mirror://cpan/authors/id/S/SY/SYOHEX/Devel-CheckCompiler-0.07.tar.gz; sha256 = "1db973a4dbyknjxq608hywil5ai6vplnayshqxrd7m5qnjbpd2vn"; @@ -4009,28 +4321,31 @@ let }; }; - DevelChecklib = buildPerlPackage rec { - name = "Devel-CheckLib-1.13"; + DevelChecklib = buildPerlPackage { + pname = "Devel-CheckLib"; + version = "1.13"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MATTN/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MATTN/Devel-CheckLib-1.13.tar.gz; sha256 = "1a19qkwxwz3wqb16cdabymfbf9kiydiifw90nd5srpq5hy8gvb94"; }; buildInputs = [ IOCaptureOutput MockConfig ]; }; - DevelCheckOS = buildPerlPackage rec { - name = "Devel-CheckOS-1.81"; + DevelCheckOS = buildPerlPackage { + pname = "Devel-CheckOS"; + version = "1.81"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCANTRELL/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.81.tar.gz; sha256 = "f3c17b56b79283b62616f938d36c57adc9df06bfaa295ff98be21e9014a23b10"; }; propagatedBuildInputs = [ DataCompare ]; }; - DevelPatchPerl = buildPerlPackage rec { - name = "Devel-PatchPerl-1.56"; + DevelPatchPerl = buildPerlPackage { + pname = "Devel-PatchPerl"; + version = "1.56"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-1.56.tar.gz; sha256 = "1b97a6b82qh1dsv13rgxyiv4lffp360crgc9wiq3pyj0zr13nfc2"; }; propagatedBuildInputs = [ Filepushd ModulePluggable ]; @@ -4042,7 +4357,8 @@ let }; DevelRefcount = buildPerlModule { - name = "Devel-Refcount-0.10"; + pname = "Devel-Refcount"; + version = "0.10"; src = fetchurl { url = mirror://cpan/authors/id/P/PE/PEVANS/Devel-Refcount-0.10.tar.gz; sha256 = "0jnaraqkigyinhwz4nqk1ndq7ssjizr98nd1dd183a6icdlx8m5n"; @@ -4054,8 +4370,9 @@ let }; }; - DevelPPPort = buildPerlPackage rec { - name = "Devel-PPPort-3.45"; + DevelPPPort = buildPerlPackage { + pname = "Devel-PPPort"; + version = "3.45"; src = fetchurl { url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.45.tar.gz; sha256 = "171dcfb3abd964081986634b79c53108f0825c47f95f915eb7cdb3309f7d04f0"; @@ -4067,7 +4384,8 @@ let }; DevelTrace = buildPerlPackage { - name = "Devel-Trace-0.12"; + pname = "Devel-Trace"; + version = "0.12"; src = fetchurl { url = mirror://cpan/authors/id/M/MJ/MJD/Devel-Trace-0.12.tar.gz; sha256 = "0s1q1a05gk3xvwqkya3k05vqjk13rvb489g0frprhzpzfvvwl0gm"; @@ -4079,7 +4397,8 @@ let }; DBDMock = buildPerlModule { - name = "DBD-Mock-1.45"; + pname = "DBD-Mock"; + version = "1.45"; src = fetchurl { url = mirror://cpan/authors/id/D/DI/DICHI/DBD-Mock/DBD-Mock-1.45.tar.gz; sha256 = "40a80c37b31ef14536b58b4a8b483e65953b00b8fa7397817c7eb76d540bd00f"; @@ -4100,11 +4419,11 @@ let DBFile = callPackage ../development/perl-modules/DB_File { }; - DBI = buildPerlPackage rec { - name = "DBI-${version}"; + DBI = buildPerlPackage { + pname = "DBI"; version = "1.642"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TIMB/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.642.tar.gz; sha256 = "3f2025023a56286cebd15cb495e36ccd9b456c3cc229bf2ce1f69e9ebfc27f5d"; }; postInstall = stdenv.lib.optionalString (perl ? crossVersion) '' @@ -4152,10 +4471,11 @@ let }; }; - DBIxClass = buildPerlPackage rec { - name = "DBIx-Class-0.082841"; + DBIxClass = buildPerlPackage { + pname = "DBIx-Class"; + version = "0.082841"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.082841.tar.gz; sha256 = "d705f85825aced299020534349778537524526d64f524217ca362787f683c3bd"; }; buildInputs = [ DBDSQLite TestDeep TestException TestWarn ]; @@ -4167,10 +4487,11 @@ let }; }; - DBIxClassCandy = buildPerlPackage rec { - name = "DBIx-Class-Candy-0.005003"; + DBIxClassCandy = buildPerlPackage { + pname = "DBIx-Class-Candy"; + version = "0.005003"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Candy-0.005003.tar.gz; sha256 = "b8a229a7b15f559095d4561cf8220460128541ba7fc3545ed35869923d46565c"; }; buildInputs = [ TestDeep TestFatal ]; @@ -4183,7 +4504,8 @@ let }; DBIxClassCursorCached = buildPerlPackage { - name = "DBIx-Class-Cursor-Cached-1.001004"; + pname = "DBIx-Class-Cursor-Cached"; + version = "1.001004"; src = fetchurl { url = mirror://cpan/authors/id/A/AR/ARCANEZ/DBIx-Class-Cursor-Cached-1.001004.tar.gz; sha256 = "09b2jahn2x12qm4f7qm1jzsxbz7qn1czp6a3fnl5l2i3l4r5421p"; @@ -4196,19 +4518,21 @@ let }; }; - DBIxClassHTMLWidget = buildPerlPackage rec { - name = "DBIx-Class-HTMLWidget-0.16"; + DBIxClassHTMLWidget = buildPerlPackage { + pname = "DBIx-Class-HTMLWidget"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDREMAR/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AN/ANDREMAR/DBIx-Class-HTMLWidget-0.16.tar.gz; sha256 = "05zhniyzl31nq410ywhxm0vmvac53h7ax42hjs9mmpvf45ipahj1"; }; propagatedBuildInputs = [ DBIxClass HTMLWidget ]; }; - DBIxClassHelpers = buildPerlPackage rec { - name = "DBIx-Class-Helpers-2.033004"; + DBIxClassHelpers = buildPerlPackage { + pname = "DBIx-Class-Helpers"; + version = "2.033004"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Helpers-2.033004.tar.gz; sha256 = "14bc7adda3b30867311717faa11a4534bceda3061229dc2533647c1906d8784c"; }; buildInputs = [ DBDSQLite DateTimeFormatSQLite TestDeep TestFatal TestRoo aliased ]; @@ -4220,10 +4544,11 @@ let }; }; - DBIxClassIntrospectableM2M = buildPerlPackage rec { - name = "DBIx-Class-IntrospectableM2M-0.001002"; + DBIxClassIntrospectableM2M = buildPerlPackage { + pname = "DBIx-Class-IntrospectableM2M"; + version = "0.001002"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; + url = mirror://cpan/authors/id/I/IL/ILMARI/DBIx-Class-IntrospectableM2M-0.001002.tar.gz; sha256 = "c6baafb4241693fdb34b29ebd906993add364bf31aafa4462f3e062204cc87f0"; }; propagatedBuildInputs = [ DBIxClass ]; @@ -4233,10 +4558,11 @@ let }; }; - DBIxClassSchemaLoader = buildPerlPackage rec { - name = "DBIx-Class-Schema-Loader-0.07049"; + DBIxClassSchemaLoader = buildPerlPackage { + pname = "DBIx-Class-Schema-Loader"; + version = "0.07049"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; + url = mirror://cpan/authors/id/I/IL/ILMARI/DBIx-Class-Schema-Loader-0.07049.tar.gz; sha256 = "e869cdde1378cfebccf229b0cde58d2746dc6080b75f56d072aa5f1fce76a764"; }; buildInputs = [ DBDSQLite TestDeep TestDifferences TestException TestWarn ]; @@ -4247,10 +4573,11 @@ let }; }; - DBIxConnector = buildPerlModule rec { - name = "DBIx-Connector-0.56"; + DBIxConnector = buildPerlModule { + pname = "DBIx-Connector"; + version = "0.56"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DW/DWHEELER/DBIx-Connector-0.56.tar.gz; sha256 = "57c08d2c1951486cb95cfb83f518f462a3dbf20d353f3eee4f46af44fa19c359"; }; buildInputs = [ TestMockModule ]; @@ -4262,7 +4589,8 @@ let }; DBIxDBSchema = buildPerlPackage { - name = "DBIx-DBSchema-0.45"; + pname = "DBIx-DBSchema"; + version = "0.45"; src = fetchurl { url = mirror://cpan/authors/id/I/IV/IVAN/DBIx-DBSchema-0.45.tar.gz; sha256 = "7a2a978fb6d9feaa3e4b109c71c963b26a008a2d130c5876ecf24c5a72338a1d"; @@ -4270,17 +4598,9 @@ let propagatedBuildInputs = [ DBI ]; }; - DBIxHTMLViewLATEST = buildPerlPackage { - name = "DBIx-HTMLView-LATEST"; - src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAKANARDO/DBIx-HTMLView-LATEST.tar.gz; - sha256 = "b1af44cba329a8f583d174c5e82a7a2e91fe4f3a35cc38cbf028449578114dfa"; - }; - doCheck = false; - }; - DBIxSearchBuilder = buildPerlPackage { - name = "DBIx-SearchBuilder-1.67"; + pname = "DBIx-SearchBuilder"; + version = "1.67"; src = fetchurl { url = mirror://cpan/authors/id/B/BP/BPS/DBIx-SearchBuilder-1.67.tar.gz; sha256 = "453179c22a61af573e502c8396f3f28daea03dfdc162094b90f9b3c331d563da"; @@ -4294,7 +4614,8 @@ let }; DBIxSimple = buildPerlPackage { - name = "DBIx-Simple-1.37"; + pname = "DBIx-Simple"; + version = "1.37"; src = fetchurl { url = mirror://cpan/authors/id/J/JU/JUERD/DBIx-Simple-1.37.tar.gz; sha256 = "46d311aa2ce08907401c56119658426dbb044c5a40de73d9a7b79bf50390cae3"; @@ -4306,7 +4627,8 @@ let }; DataBinary = buildPerlPackage { - name = "Data-Binary-0.01"; + pname = "Data-Binary"; + version = "0.01"; src = fetchurl { url = mirror://cpan/authors/id/S/SN/SNKWATT/Data-Binary-0.01.tar.gz; sha256 = "0wwdrgkz4yqpzdmfvid63v5v10b9hwdsg15jvks0hwdc23ga48a8"; @@ -4317,10 +4639,11 @@ let }; }; - DBIxIntrospector = buildPerlPackage rec { - name = "DBIx-Introspector-0.001005"; + DBIxIntrospector = buildPerlPackage { + pname = "DBIx-Introspector"; + version = "0.001005"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Introspector-0.001005.tar.gz; sha256 = "0fp6h71xv4pgb8l815rs6ad4camzhjqf64s1sf7zmhchqqn4vacn"; }; @@ -4329,7 +4652,8 @@ let }; DevelCycle = buildPerlPackage { - name = "Devel-Cycle-1.12"; + pname = "Devel-Cycle"; + version = "1.12"; src = fetchurl { url = mirror://cpan/authors/id/L/LD/LDS/Devel-Cycle-1.12.tar.gz; sha256 = "1hhb77kz3dys8yaik452j22cm3510zald2mpvfyv5clqv326aczx"; @@ -4339,10 +4663,11 @@ let }; }; - DevelDeclare = buildPerlPackage rec { - name = "Devel-Declare-0.006019"; + DevelDeclare = buildPerlPackage { + pname = "Devel-Declare"; + version = "0.006019"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/Devel-Declare-0.006019.tar.gz; sha256 = "ac719dc289cbf53fbb3b090ccd3a55a9d207f24e09480423c96f7185af131808"; }; buildInputs = [ ExtUtilsDepends TestRequires ]; @@ -4353,10 +4678,11 @@ let }; }; - DevelFindPerl = buildPerlPackage rec { - name = "Devel-FindPerl-0.015"; + DevelFindPerl = buildPerlPackage { + pname = "Devel-FindPerl"; + version = "0.015"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; + url = mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.015.tar.gz; sha256 = "1z1xfj3178w632mqddyklk355a19bsgzkilznrng3rvg4bfbfxaj"; }; meta = { @@ -4365,10 +4691,11 @@ let }; }; - DevelGlobalDestruction = buildPerlPackage rec { - name = "Devel-GlobalDestruction-0.14"; + DevelGlobalDestruction = buildPerlPackage { + pname = "Devel-GlobalDestruction"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; + url = mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalDestruction-0.14.tar.gz; sha256 = "1aslj6myylsvzr0vpqry1cmmvzbmpbdcl4v9zrl18ccik7rabf1l"; }; propagatedBuildInputs = [ SubExporterProgressive ]; @@ -4377,8 +4704,9 @@ let }; }; - DevelGlobalPhase = buildPerlPackage rec { - name = "Devel-GlobalPhase-0.003003"; + DevelGlobalPhase = buildPerlPackage { + pname = "Devel-GlobalPhase"; + version = "0.003003"; src = fetchurl { url = mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalPhase-0.003003.tar.gz; sha256 = "1x9jzy3l7gwikj57swzl94qsq03j9na9h1m69azzs7d7ghph58wd"; @@ -4389,18 +4717,20 @@ let }; }; - DevelHide = buildPerlPackage rec { - name = "Devel-Hide-0.0010"; + DevelHide = buildPerlPackage { + pname = "Devel-Hide"; + version = "0.0010"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FE/FERREIRA/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FE/FERREIRA/Devel-Hide-0.0010.tar.gz; sha256 = "10jyv9nmv513hs75rls5yx2xn82513xnnhjir3dxiwgb1ykfyvvm"; }; }; - DevelNYTProf = buildPerlPackage rec { - name = "Devel-NYTProf-6.06"; + DevelNYTProf = buildPerlPackage { + pname = "Devel-NYTProf"; + version = "6.06"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TIMB/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TI/TIMB/Devel-NYTProf-6.06.tar.gz; sha256 = "a14227ca79f1750b92cc7b8b0a5806c92abc4964a21a7fb100bd4907d6c4be55"; }; propagatedBuildInputs = [ FileWhich JSONMaybeXS ]; @@ -4412,8 +4742,9 @@ let buildInputs = [ TestDifferences ]; }; - DevelOverloadInfo = buildPerlPackage rec { - name = "Devel-OverloadInfo-0.005"; + DevelOverloadInfo = buildPerlPackage { + pname = "Devel-OverloadInfo"; + version = "0.005"; src = fetchurl { url = mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.005.tar.gz; sha256 = "1rx6g8pyhi7lx6z130b7vlf8syzrq92w9ky8mpw4d6bwlkzy5zcb"; @@ -4427,7 +4758,8 @@ let }; DevelPartialDump = buildPerlPackage { - name = "Devel-PartialDump-0.20"; + pname = "Devel-PartialDump"; + version = "0.20"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Devel-PartialDump-0.20.tar.gz; sha256 = "01yrsdpn9ns9iwwc92bhjn2605b7ys7i3198gjb935lsllzgzw5f"; @@ -4437,7 +4769,8 @@ let }; DevelStackTrace = buildPerlPackage { - name = "Devel-StackTrace-2.03"; + pname = "Devel-StackTrace"; + version = "2.03"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-2.03.tar.gz; sha256 = "7618cd4ebe24e254c17085f4b418784ab503cb4cb3baf8f48a7be894e59ba848"; @@ -4449,7 +4782,8 @@ let }; DevelStackTraceAsHTML = buildPerlPackage { - name = "Devel-StackTrace-AsHTML-0.15"; + pname = "Devel-StackTrace-AsHTML"; + version = "0.15"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Devel-StackTrace-AsHTML-0.15.tar.gz; sha256 = "0iri5nb2lb76qv5l9z0vjpfrq5j2fyclkd64kh020bvy37idp0v2"; @@ -4461,10 +4795,11 @@ let }; }; - DevelSymdump = buildPerlPackage rec { - name = "Devel-Symdump-2.18"; + DevelSymdump = buildPerlPackage { + pname = "Devel-Symdump"; + version = "2.18"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AN/ANDK/Devel-Symdump-2.18.tar.gz; sha256 = "826f81a107f5592a2516766ed43beb47e10cc83edc9ea48090b02a36040776c0"; }; meta = { @@ -4473,10 +4808,11 @@ let }; }; - DigestCRC = buildPerlPackage rec { - name = "Digest-CRC-0.22.2"; + DigestCRC = buildPerlPackage { + pname = "Digest-CRC"; + version = "0.22.2"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OL/OLIMAUL/${name}.tar.gz"; + url = mirror://cpan/authors/id/O/OL/OLIMAUL/Digest-CRC-0.22.2.tar.gz; sha256 = "112b50f7fbc6f6baf5d4584ee97f542ced6c9ec03a3147f7902c84b8b26778cb"; }; meta = { @@ -4486,7 +4822,8 @@ let }; DigestHMAC = buildPerlPackage { - name = "Digest-HMAC-1.03"; + pname = "Digest-HMAC"; + version = "1.03"; src = fetchurl { url = mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.03.tar.gz; sha256 = "0naavabbm1c9zgn325ndy66da4insdw9l3mrxwxdfi7i7xnjrirv"; @@ -4497,10 +4834,11 @@ let }; }; - DigestJHash = buildPerlPackage rec { - name = "Digest-JHash-0.10"; + DigestJHash = buildPerlPackage { + pname = "Digest-JHash"; + version = "0.10"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Digest-JHash-0.10.tar.gz; sha256 = "c746cf0a861a004090263cd54d7728d0c7595a0cf90cbbfd8409b396ee3b0063"; }; meta = { @@ -4509,16 +4847,18 @@ let }; }; - DigestMD4 = buildPerlPackage rec { - name = "Digest-MD4-1.9"; + DigestMD4 = buildPerlPackage { + pname = "Digest-MD4"; + version = "1.9"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/Digest-MD4-1.9.tar.gz; sha256 = "19ma1hmvgiznq95ngzvm6v4dfxc9zmi69k8iyfcg6w14lfxi0lb6"; }; }; DigestMD5File = buildPerlPackage { - name = "Digest-MD5-File-0.08"; + pname = "Digest-MD5-File"; + version = "0.08"; src = fetchurl { url = mirror://cpan/authors/id/D/DM/DMUEY/Digest-MD5-File-0.08.tar.gz; sha256 = "060jzf45dlwysw5wsm7av1wvpl06xgk415kwwpvv89r6wda3md5d"; @@ -4529,10 +4869,11 @@ let }; }; - DigestPerlMD5 = buildPerlPackage rec { - name = "Digest-Perl-MD5-1.9"; + DigestPerlMD5 = buildPerlPackage { + pname = "Digest-Perl-MD5"; + version = "1.9"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DE/DELTA/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DE/DELTA/Digest-Perl-MD5-1.9.tar.gz; sha256 = "7100cba1710f45fb0e907d8b1a7bd8caef35c64acd31d7f225aff5affeecd9b1"; }; meta = { @@ -4542,7 +4883,8 @@ let }; DigestSHA1 = buildPerlPackage { - name = "Digest-SHA1-2.13"; + pname = "Digest-SHA1"; + version = "2.13"; src = fetchurl { url = mirror://cpan/authors/id/G/GA/GAAS/Digest-SHA1-2.13.tar.gz; sha256 = "1k23p5pjk42vvzg8xcn4iwdii47i0qm4awdzgbmz08bl331dmhb8"; @@ -4553,10 +4895,11 @@ let }; }; - DistCheckConflicts = buildPerlPackage rec { - name = "Dist-CheckConflicts-0.11"; + DistCheckConflicts = buildPerlPackage { + pname = "Dist-CheckConflicts"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DO/DOY/Dist-CheckConflicts-0.11.tar.gz; sha256 = "1i7dr9jpdiy2nijl2p4q5zg2q2s9ckbj2hs4kmnnckf9hsb4p17a"; }; buildInputs = [ TestFatal ]; @@ -4568,7 +4911,8 @@ let }; DistZilla = buildPerlPackage { - name = "Dist-Zilla-6.012"; + pname = "Dist-Zilla"; + version = "6.012"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.012.tar.gz; sha256 = "0w1hhvxcdf52ln940f8i37adv2gp7l8ryf2nm6m7haynyrsk0n37"; @@ -4584,7 +4928,8 @@ let }; DistZillaPluginBundleTestingMania = buildPerlModule { - name = "Dist-Zilla-PluginBundle-TestingMania-0.25"; + pname = "Dist-Zilla-PluginBundle-TestingMania"; + version = "0.25"; src = fetchurl { url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-PluginBundle-TestingMania-0.25.tar.gz; sha256 = "072rsilh88xnk18ldbr8d0svji72r79sabyird6xc3ql1z0b42sy"; @@ -4599,7 +4944,8 @@ let }; DistZillaPluginCheckChangeLog = buildPerlPackage { - name = "Dist-Zilla-Plugin-CheckChangeLog-0.05"; + pname = "Dist-Zilla-Plugin-CheckChangeLog"; + version = "0.05"; src = fetchurl { url = mirror://cpan/authors/id/F/FA/FAYLAND/Dist-Zilla-Plugin-CheckChangeLog-0.05.tar.gz; sha256 = "b0b34d6d70b56f1944d03c5f0dc3b8f6f24474c816d07b657a116c692c2e052a"; @@ -4613,7 +4959,8 @@ let }; DistZillaPluginMojibakeTests = buildPerlPackage { - name = "Dist-Zilla-Plugin-MojibakeTests-0.8"; + pname = "Dist-Zilla-Plugin-MojibakeTests"; + version = "0.8"; src = fetchurl { url = mirror://cpan/authors/id/S/SY/SYP/Dist-Zilla-Plugin-MojibakeTests-0.8.tar.gz; sha256 = "f1fff547ea24a8f7a483406a72ed6c4058d746d9dae963725502ddba025ab380"; @@ -4628,7 +4975,8 @@ let }; DistZillaPluginPodWeaver = buildPerlPackage { - name = "Dist-Zilla-Plugin-PodWeaver-4.008"; + pname = "Dist-Zilla-Plugin-PodWeaver"; + version = "4.008"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-Plugin-PodWeaver-4.008.tar.gz; sha256 = "0ff1i26s54z292j8w8vm3gw3p7w1yq35wi8g978c84ia7y1y7n8z"; @@ -4642,7 +4990,8 @@ let }; DistZillaPluginReadmeAnyFromPod = buildPerlPackage { - name = "Dist-Zilla-Plugin-ReadmeAnyFromPod-0.163250"; + pname = "Dist-Zilla-Plugin-ReadmeAnyFromPod"; + version = "0.163250"; src = fetchurl { url = mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeAnyFromPod-0.163250.tar.gz; sha256 = "d44f2799922f78b2a7961ed89123e11bdd77abfe85ba2040d82b80ad72ed13bc"; @@ -4657,7 +5006,8 @@ let }; DistZillaPluginReadmeMarkdownFromPod = buildPerlPackage { - name = "Dist-Zilla-Plugin-ReadmeMarkdownFromPod-0.141140"; + pname = "Dist-Zilla-Plugin-ReadmeMarkdownFromPod"; + version = "0.141140"; src = fetchurl { url = mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeMarkdownFromPod-0.141140.tar.gz; sha256 = "9caad7b366ea59119ad73cdd99dcdd53f877a515bd0164fc28b339c01739a801"; @@ -4671,10 +5021,11 @@ let }; }; - DistZillaPluginTestCPANChanges = buildPerlPackage rec { - name = "Dist-Zilla-Plugin-Test-CPAN-Changes-0.012"; + DistZillaPluginTestCPANChanges = buildPerlPackage { + pname = "Dist-Zilla-Plugin-Test-CPAN-Changes"; + version = "0.012"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOHERTY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-CPAN-Changes-0.012.tar.gz; sha256 = "215b3a5c3c58c8bab0ea27130441bbdaec737eecc00f0670937f608bdbf64806"; }; buildInputs = [ CPANChanges TestDeep ]; @@ -4686,7 +5037,8 @@ let }; DistZillaPluginTestCPANMetaJSON = buildPerlModule { - name = "Dist-Zilla-Plugin-Test-CPAN-Meta-JSON-0.004"; + pname = "Dist-Zilla-Plugin-Test-CPAN-Meta-JSON"; + version = "0.004"; src = fetchurl { url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-CPAN-Meta-JSON-0.004.tar.gz; sha256 = "0a573e1d5640374e6ee4d56d4fb94a3c67d4e75d52b3ddeae70cfa6450e1af22"; @@ -4700,10 +5052,11 @@ let }; }; - DistZillaPluginTestCompile = buildPerlModule rec { - name = "Dist-Zilla-Plugin-Test-Compile-2.058"; + DistZillaPluginTestCompile = buildPerlModule { + pname = "Dist-Zilla-Plugin-Test-Compile"; + version = "2.058"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Compile-2.058.tar.gz; sha256 = "d0cf93e525f102eca0f7f3967124d2e59d0a212f738ce54c1ddd91dda268d88a"; }; buildInputs = [ CPANMetaCheck ModuleBuildTiny TestDeep TestMinimumVersion TestWarnings ]; @@ -4716,7 +5069,8 @@ let }; DistZillaPluginTestDistManifest = buildPerlModule { - name = "Dist-Zilla-Plugin-Test-DistManifest-2.000005"; + pname = "Dist-Zilla-Plugin-Test-DistManifest"; + version = "2.000005"; src = fetchurl { url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-DistManifest-2.000005.tar.gz; sha256 = "4f0af27bb38745d2dec7d941bcf749e6d7fbeaf8e7bcf8a79a1310a9639b0f65"; @@ -4730,7 +5084,8 @@ let }; DistZillaPluginTestEOL = buildPerlModule { - name = "Dist-Zilla-Plugin-Test-EOL-0.19"; + pname = "Dist-Zilla-Plugin-Test-EOL"; + version = "0.19"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-EOL-0.19.tar.gz; sha256 = "0f23g931azz1k41xdfxw7kayy4snhw4qdr9ysknk5k1cl33mkfd2"; @@ -4744,7 +5099,8 @@ let }; DistZillaPluginTestKwalitee = buildPerlModule { - name = "Dist-Zilla-Plugin-Test-Kwalitee-2.12"; + pname = "Dist-Zilla-Plugin-Test-Kwalitee"; + version = "2.12"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Kwalitee-2.12.tar.gz; sha256 = "bddbcfcc75e8eb2d2d9c8611552f00cdc1b051f0f00798623b8692ff5030af2f"; @@ -4758,7 +5114,8 @@ let }; DistZillaPluginTestMinimumVersion = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-MinimumVersion-2.000008"; + pname = "Dist-Zilla-Plugin-Test-MinimumVersion"; + version = "2.000008"; src = fetchurl { url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-MinimumVersion-2.000008.tar.gz; sha256 = "d924ce79aaaa1885510ca6ecfcb4d8bc250fb6995bc96627f1536cb589e3b660"; @@ -4771,8 +5128,9 @@ let }; }; - DistZillaPluginTestNoTabs = buildPerlModule rec { - name = "Dist-Zilla-Plugin-Test-NoTabs-0.15"; + DistZillaPluginTestNoTabs = buildPerlModule { + pname = "Dist-Zilla-Plugin-Test-NoTabs"; + version = "0.15"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-NoTabs-0.15.tar.gz; sha256 = "196hchmn8y591533v3p7kl75nlhpaygbfdiw2iqbnab9j510qq8v"; @@ -4787,7 +5145,8 @@ let }; DistZillaPluginTestPerlCritic = buildPerlModule { - name = "Dist-Zilla-Plugin-Test-Perl-Critic-3.001"; + pname = "Dist-Zilla-Plugin-Test-Perl-Critic"; + version = "3.001"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Perl-Critic-3.001.tar.gz; sha256 = "9250b59d5dc1ae4c6893ba783bd3f05131b14ff9e91afb4555314f55268a3825"; @@ -4800,10 +5159,11 @@ let }; }; - DistZillaPluginTestPodLinkCheck = buildPerlPackage rec { - name = "Dist-Zilla-Plugin-Test-Pod-LinkCheck-1.004"; + DistZillaPluginTestPodLinkCheck = buildPerlPackage { + pname = "Dist-Zilla-Plugin-Test-Pod-LinkCheck"; + version = "1.004"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RW/RWSTAUNER/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Dist-Zilla-Plugin-Test-Pod-LinkCheck-1.004.tar.gz; sha256 = "325d236da0940388d2aa86ec5c1326516b4ad45adef8e7a4f83bb91d5ee15490"; }; # buildInputs = [ TestPodLinkCheck ]; @@ -4816,7 +5176,8 @@ let }; DistZillaPluginTestPortability = buildPerlModule { - name = "Dist-Zilla-Plugin-Test-Portability-2.001000"; + pname = "Dist-Zilla-Plugin-Test-Portability"; + version = "2.001000"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Portability-2.001000.tar.gz; sha256 = "e08ff5bd9e24cf9503055330148913808d91a3dfe320a2bdf8b0fc638719b179"; @@ -4830,7 +5191,8 @@ let }; DistZillaPluginTestSynopsis = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-Synopsis-2.000007"; + pname = "Dist-Zilla-Plugin-Test-Synopsis"; + version = "2.000007"; src = fetchurl { url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-Synopsis-2.000007.tar.gz; sha256 = "e7d5e2530cd8a5bb5aadf3e1669a653aaa96e32cad7bd6b9caba6b425ceab563"; @@ -4844,7 +5206,8 @@ let }; DistZillaPluginTestUnusedVars = buildPerlModule { - name = "Dist-Zilla-Plugin-Test-UnusedVars-2.000007"; + pname = "Dist-Zilla-Plugin-Test-UnusedVars"; + version = "2.000007"; src = fetchurl { url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-UnusedVars-2.000007.tar.gz; sha256 = "ea0199a3a0043213ddc132508b9ed9b131ef717735b8f93d78291191d04b43c2"; @@ -4858,7 +5221,8 @@ let }; DistZillaPluginTestVersion = buildPerlPackage { - name = "Dist-Zilla-Plugin-Test-Version-1.09"; + pname = "Dist-Zilla-Plugin-Test-Version"; + version = "1.09"; src = fetchurl { url = mirror://cpan/authors/id/P/PL/PLICEASE/Dist-Zilla-Plugin-Test-Version-1.09.tar.gz; sha256 = "7240508731bc1bf6dfad7701ec65450a18ef9245a521ab26ebd6acb39a9ebe17"; @@ -4871,8 +5235,9 @@ let }; }; - DistZillaRoleFileWatcher = buildPerlModule rec { - name = "Dist-Zilla-Role-FileWatcher-0.006"; + DistZillaRoleFileWatcher = buildPerlModule { + pname = "Dist-Zilla-Role-FileWatcher"; + version = "0.006"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Role-FileWatcher-0.006.tar.gz; sha256 = "15jfpr257xxp27gz156npgpj7kh2dchzgfmvzivi5bvdb2wl8fpy"; @@ -4887,7 +5252,8 @@ let }; Dumbbench = buildPerlPackage { - name = "Dumbbench-0.111"; + pname = "Dumbbench"; + version = "0.111"; src = fetchurl { url = mirror://cpan/authors/id/B/BD/BDFOY/Dumbbench-0.111.tar.gz; sha256 = "1ixjb9y9d0k1vd4mzbi4sgvr99ay4z9jkgychf0r5gbjsskkq7fk"; @@ -4900,10 +5266,11 @@ let }; }; - EmailAbstract = buildPerlPackage rec { - name = "Email-Abstract-3.008"; + EmailAbstract = buildPerlPackage { + pname = "Email-Abstract"; + version = "3.008"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Abstract-3.008.tar.gz; sha256 = "fc7169acb6c43df7f005e7ef6ad08ee8ca6eb6796b5d1604593c997337cc8240"; }; propagatedBuildInputs = [ EmailSimple MROCompat ModulePluggable ]; @@ -4915,7 +5282,8 @@ let }; EmailAddress = buildPerlPackage { - name = "Email-Address-1.912"; + pname = "Email-Address"; + version = "1.912"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.912.tar.gz; sha256 = "1vzr0vx4zsw4zbc9xdffc31wnkc1raqmyfiyws06fbyck197i8qg"; @@ -4927,7 +5295,8 @@ let }; EmailAddressList = buildPerlPackage { - name = "Email-Address-List-0.06"; + pname = "Email-Address-List"; + version = "0.06"; src = fetchurl { url = mirror://cpan/authors/id/B/BP/BPS/Email-Address-List-0.06.tar.gz; sha256 = "305b94c778011cee70d9f21514d92e985fa9dccbb84c64798f0c1f0b24eb870e"; @@ -4940,8 +5309,9 @@ let }; }; - EmailAddressXS = buildPerlPackage rec { - name = "Email-Address-XS-1.04"; + EmailAddressXS = buildPerlPackage { + pname = "Email-Address-XS"; + version = "1.04"; src = fetchurl { url = mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.04.tar.gz; sha256 = "0gjrrl81z3sfwavgx5kwjd87gj44mlnbbqsm3dgdv1xllw26spwr"; @@ -4952,10 +5322,11 @@ let }; }; - EmailDateFormat = buildPerlPackage rec { - name = "Email-Date-Format-1.005"; + EmailDateFormat = buildPerlPackage { + pname = "Email-Date-Format"; + version = "1.005"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Date-Format-1.005.tar.gz; sha256 = "579c617e303b9d874411c7b61b46b59d36f815718625074ae6832e7bb9db5104"; }; meta = { @@ -4965,8 +5336,9 @@ let }; }; - EmailReply = buildPerlPackage rec { - name = "Email-Reply-1.204"; + EmailReply = buildPerlPackage { + pname = "Email-Reply"; + version = "1.204"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Reply-1.204.tar.gz; sha256 = "ba4fd80ac5017d6d132e0358c786b0ecd1c7adcbeee5c19fb3da2964791a56f0"; @@ -4979,7 +5351,8 @@ let }; EmailMessageID = buildPerlPackage { - name = "Email-MessageID-1.406"; + pname = "Email-MessageID"; + version = "1.406"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.406.tar.gz; sha256 = "1f22sdnfq169qw1l0lg7y74pmiam7j9v95bggjnf3q4mygdmshpc"; @@ -4990,10 +5363,11 @@ let }; }; - EmailMIME = buildPerlPackage rec { - name = "Email-MIME-1.946"; + EmailMIME = buildPerlPackage { + pname = "Email-MIME"; + version = "1.946"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.946.tar.gz; sha256 = "68ee79023165d77bec99a2e12ef89ad4e12501e6c321f6822053dc4f411c337c"; }; propagatedBuildInputs = [ EmailAddressXS EmailMIMEContentType EmailMIMEEncodings EmailMessageID EmailSimple MIMETypes ModuleRuntime ]; @@ -5004,8 +5378,9 @@ let }; }; - EmailMIMEAttachmentStripper = buildPerlPackage rec { - name = "Email-MIME-Attachment-Stripper-1.317"; + EmailMIMEAttachmentStripper = buildPerlPackage { + pname = "Email-MIME-Attachment-Stripper"; + version = "1.317"; buildInputs = [ CaptureTiny ]; propagatedBuildInputs = [ EmailAbstract EmailMIME ]; @@ -5019,10 +5394,11 @@ let }; }; - EmailMIMEContentType = buildPerlPackage rec { - name = "Email-MIME-ContentType-1.022"; + EmailMIMEContentType = buildPerlPackage { + pname = "Email-MIME-ContentType"; + version = "1.022"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.022.tar.gz; sha256 = "9abb7280b0da62a855ae5528b14deb94341a84e721af0a7e5a2adc3534ec5310"; }; meta = { @@ -5032,10 +5408,11 @@ let }; }; - EmailMIMEEncodings = buildPerlPackage rec { - name = "Email-MIME-Encodings-1.315"; + EmailMIMEEncodings = buildPerlPackage { + pname = "Email-MIME-Encodings"; + version = "1.315"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.315.tar.gz; sha256 = "4c71045507b31ec853dd60152b40e33ba3741779c0f49bb143b50cf8d243ab5c"; }; buildInputs = [ CaptureTiny ]; @@ -5046,10 +5423,11 @@ let }; }; - EmailSend = buildPerlPackage rec { - name = "Email-Send-2.201"; + EmailSend = buildPerlPackage { + pname = "Email-Send"; + version = "2.201"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Send-2.201.tar.gz; sha256 = "4bbec933558d7cc9b8152bad86dd313de277a21a89b4ea83d84e61587e95dbc6"; }; propagatedBuildInputs = [ EmailAbstract EmailAddress ReturnValue ]; @@ -5061,11 +5439,11 @@ let buildInputs = [ MIMETools MailTools ]; }; - EmailOutlookMessage = buildPerlModule rec { - name = "Email-Outlook-Message-${version}"; + EmailOutlookMessage = buildPerlModule { + pname = "Email-Outlook-Message"; version = "0.919"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MV/MVZ/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MV/MVZ/Email-Outlook-Message-0.919.tar.gz; sha256 = "0fb1gymqa8nlj540dmbb1rhs2b0ln3y9ippbgj0miswcw92iaayb"; }; propagatedBuildInputs = [ EmailMIME EmailSender IOAll IOString OLEStorage_Lite ]; @@ -5077,10 +5455,11 @@ let }; }; - EmailSender = buildPerlPackage rec { - name = "Email-Sender-1.300031"; + EmailSender = buildPerlPackage { + pname = "Email-Sender"; + version = "1.300031"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300031.tar.gz; sha256 = "c412372938510283d8c850127895e09c2b670f892e1c3992fd54c0c1a9064f14"; }; buildInputs = [ CaptureTiny ]; @@ -5092,10 +5471,11 @@ let }; }; - EmailSimple = buildPerlPackage rec { - name = "Email-Simple-2.216"; + EmailSimple = buildPerlPackage { + pname = "Email-Simple"; + version = "2.216"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.216.tar.gz; sha256 = "d85f63cd1088d11311103676a8cf498fff564a201b538de52cd753b5e5ca8bd4"; }; propagatedBuildInputs = [ EmailDateFormat ]; @@ -5106,20 +5486,22 @@ let }; }; - EmailValid = buildPerlPackage rec { - name = "Email-Valid-1.202"; + EmailValid = buildPerlPackage { + pname = "Email-Valid"; + version = "1.202"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.202.tar.gz; sha256 = "18hkmhddzbd23s6ak64d4j6q8ijykjyp5nxbr2hfcq1acsdhh8fh"; }; propagatedBuildInputs = [ IOCaptureOutput MailTools NetDNS NetDomainTLD ]; doCheck = false; }; - EmailValidLoose = buildPerlPackage rec { - name = "Email-Valid-Loose-0.05"; + EmailValidLoose = buildPerlPackage { + pname = "Email-Valid-Loose"; + version = "0.05"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Email-Valid-Loose-0.05.tar.gz; sha256 = "e718e76eddee240251c999e139c8cbe6f2cc80192da5af875cbd12fa8ab93a59"; }; propagatedBuildInputs = [ EmailValid ]; @@ -5128,10 +5510,11 @@ let }; }; - Encode = buildPerlPackage rec { - name = "Encode-3.01"; + Encode = buildPerlPackage { + pname = "Encode"; + version = "3.01"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-3.01.tar.gz; sha256 = "d4555f570491648dbbd602bce7966672834b4c8f45acaa6757de474fca3a4d87"; }; meta = { @@ -5140,10 +5523,11 @@ let }; }; - EncodeDetect = buildPerlModule rec { - name = "Encode-Detect-1.01"; + EncodeDetect = buildPerlModule { + pname = "Encode-Detect"; + version = "1.01"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JG/JGMYERS/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JG/JGMYERS/Encode-Detect-1.01.tar.gz; sha256 = "834d893aa7db6ce3f158afbd0e432d6ed15a276e0940db0a74be13fd9c4bbbf1"; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; @@ -5155,7 +5539,8 @@ let EncodeEUCJPASCII = buildPerlPackage { - name = "Encode-EUCJPASCII-0.03"; + pname = "Encode-EUCJPASCII"; + version = "0.03"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEZUMI/Encode-EUCJPASCII-0.03.tar.gz; sha256 = "f998d34d55fd9c82cf910786a0448d1edfa60bf68e2c2306724ca67c629de861"; @@ -5168,7 +5553,8 @@ let }; EncodeHanExtra = buildPerlPackage { - name = "Encode-HanExtra-0.23"; + pname = "Encode-HanExtra"; + version = "0.23"; src = fetchurl { url = mirror://cpan/authors/id/A/AU/AUDREYT/Encode-HanExtra-0.23.tar.gz; sha256 = "1fd4b06cada70858003af153f94c863b3b95f2e3d03ba18d0451a81d51db443a"; @@ -5180,7 +5566,8 @@ let }; EncodeJIS2K = buildPerlPackage { - name = "Encode-JIS2K-0.03"; + pname = "Encode-JIS2K"; + version = "0.03"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.03.tar.gz; sha256 = "1ec84d72db39deb4dad6fca95acfcc21033f45a24d347c20f9a1a696896c35cc"; @@ -5190,8 +5577,9 @@ let }; }; - EncodeLocale = buildPerlPackage rec { - name = "Encode-Locale-1.05"; + EncodeLocale = buildPerlPackage { + pname = "Encode-Locale"; + version = "1.05"; src = fetchurl { url = mirror://cpan/authors/id/G/GA/GAAS/Encode-Locale-1.05.tar.gz; sha256 = "176fa02771f542a4efb1dbc2a4c928e8f4391bf4078473bd6040d8f11adb0ec1"; @@ -5207,8 +5595,9 @@ let }; }; - EncodeNewlines = buildPerlPackage rec { - name = "Encode-Newlines-0.05"; + EncodeNewlines = buildPerlPackage { + pname = "Encode-Newlines"; + version = "0.05"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEILB/Encode-Newlines-0.05.tar.gz; sha256 = "1gipd3wnma28w5gjbzycfkpi6chksy14lhxkp4hwizf8r351zcrl"; @@ -5220,10 +5609,11 @@ let }; }; - enum = buildPerlPackage rec { - name = "enum-1.11"; + enum = buildPerlPackage { + pname = "enum"; + version = "1.11"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NE/NEILB/enum-1.11.tar.gz; sha256 = "d2f36b5015f1e35f640159867b60bf5d5cd66b56cd5e42d33f531be68e5eee35"; }; meta = { @@ -5232,7 +5622,8 @@ let }; Env = buildPerlPackage { - name = "Env-1.04"; + pname = "Env"; + version = "1.04"; src = fetchurl { url = mirror://cpan/authors/id/F/FL/FLORA/Env-1.04.tar.gz; sha256 = "d94a3d412df246afdc31a2199cbd8ae915167a3f4684f7b7014ce1200251ebb0"; @@ -5244,25 +5635,28 @@ let }; EnvPath = buildPerlPackage { - name = "Env-Path-0.19"; + pname = "Env-Path"; + version = "0.19"; src = fetchurl { url = mirror://cpan/authors/id/D/DS/DSB/Env-Path-0.19.tar.gz; sha256 = "1qhmj15a66h90pjl2dgnxsb9jj3b1r5mpvnr87cafcl8g69z0jr4"; }; }; - Error = buildPerlModule rec { - name = "Error-0.17027"; + Error = buildPerlModule { + pname = "Error"; + version = "0.17027"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Error-0.17027.tar.gz; sha256 = "1gnkxf12dq2w1jmjpllp5f30ya4nll01jv2sfi24386zfn1arch7"; }; }; - EV = buildPerlPackage rec { - name = "EV-4.25"; + EV = buildPerlPackage { + pname = "EV"; + version = "4.25"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.25.tar.gz; sha256 = "2e65c8e8f2358599f9a48f766cc1b3ad0eaf2e6cef416adc8ad9cddc3f329c6a"; }; buildInputs = [ CanaryStability ]; @@ -5273,7 +5667,8 @@ let }; EvalClosure = buildPerlPackage { - name = "Eval-Closure-0.14"; + pname = "Eval-Closure"; + version = "0.14"; src = fetchurl { url = mirror://cpan/authors/id/D/DO/DOY/Eval-Closure-0.14.tar.gz; sha256 = "1bcc47r6zm3hfr6ccsrs72kgwxm3wkk07mgnpsaxi67cypr482ga"; @@ -5285,10 +5680,11 @@ let }; }; - ExceptionBase = buildPerlModule rec { - name = "Exception-Base-0.2501"; + ExceptionBase = buildPerlModule { + pname = "Exception-Base"; + version = "0.2501"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DE/DEXTER/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Base-0.2501.tar.gz; sha256 = "5723dd78f4ac0b4d262a05ea46af663ea00d8096b2e9c0a43515c210760e1e75"; }; buildInputs = [ TestUnitLite ]; @@ -5298,17 +5694,19 @@ let }; }; - ExceptionClass = buildPerlPackage rec { - name = "Exception-Class-1.44"; + ExceptionClass = buildPerlPackage { + pname = "Exception-Class"; + version = "1.44"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Exception-Class-1.44.tar.gz; sha256 = "03gf4cdgrjnljgrlxkvbh2cahsyzn0zsh2zcli7b1lrqn7wgpwrk"; }; propagatedBuildInputs = [ ClassDataInheritable DevelStackTrace ]; }; ExceptionDied = buildPerlModule { - name = "Exception-Died-0.06"; + pname = "Exception-Died"; + version = "0.06"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Died-0.06.tar.gz; sha256 = "1dcajw2m3x5m76fpi3fvy9fjkmfrd171pnx087i5fkgx5ay41i1m"; @@ -5318,7 +5716,8 @@ let }; ExceptionWarning = buildPerlModule { - name = "Exception-Warning-0.0401"; + pname = "Exception-Warning"; + version = "0.0401"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Warning-0.0401.tar.gz; sha256 = "1a6k3sbhkxmz00wrmhv70f9kxjf7fklp1y6mnprfvcdmrsk9qdkv"; @@ -5328,7 +5727,8 @@ let }; ExporterDeclare = buildPerlModule { - name = "Exporter-Declare-0.114"; + pname = "Exporter-Declare"; + version = "0.114"; src = fetchurl { url = mirror://cpan/authors/id/E/EX/EXODIST/Exporter-Declare-0.114.tar.gz; sha256 = "4bd70d6ca76f6f6ba7e4c618d4ac93b8593a58f1233ccbe18b10f5f204f1d4e4"; @@ -5343,7 +5743,8 @@ let }; ExporterLite = buildPerlPackage { - name = "Exporter-Lite-0.08"; + pname = "Exporter-Lite"; + version = "0.08"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEILB/Exporter-Lite-0.08.tar.gz; sha256 = "1hns15imih8z2h6zv3m1wwmv9fiysacsb52y94v6zf2cmw4kjny0"; @@ -5354,7 +5755,8 @@ let }; ExporterTiny = buildPerlPackage { - name = "Exporter-Tiny-1.002001"; + pname = "Exporter-Tiny"; + version = "1.002001"; src = fetchurl { url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002001.tar.gz; sha256 = "a82c334c02ce4b0f9ea77c67bf77738f76a9b8aa4bae5c7209d1c76453d3c48d"; @@ -5366,7 +5768,8 @@ let }; ExtUtilsCBuilder = buildPerlPackage { - name = "ExtUtils-CBuilder-0.280231"; + pname = "ExtUtils-CBuilder"; + version = "0.280231"; src = fetchurl { url = mirror://cpan/authors/id/A/AM/AMBS/ExtUtils-CBuilder-0.280231.tar.gz; sha256 = "1szfbq3vw9q3h3pff23p9pzfj21rkcmbljhdnl5w2s04r932brz6"; @@ -5379,7 +5782,8 @@ let }; Expect = buildPerlPackage { - name = "Expect-1.35"; + pname = "Expect"; + version = "1.35"; src = fetchurl { url = mirror://cpan/authors/id/J/JA/JACOBY/Expect-1.35.tar.gz; sha256 = "09d92761421decd495853103379165a99efbf452c720f30277602cf23679fd06"; @@ -5391,10 +5795,11 @@ let }; }; - ExtUtilsCChecker = buildPerlModule rec { - name = "ExtUtils-CChecker-0.10"; + ExtUtilsCChecker = buildPerlModule { + pname = "ExtUtils-CChecker"; + version = "0.10"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PE/PEVANS/ExtUtils-CChecker-0.10.tar.gz; sha256 = "50bfe76870fc1510f56bae4fa2dce0165d9ac4af4e7320d6b8fda14dfea4be0b"; }; buildInputs = [ TestFatal ]; @@ -5405,7 +5810,8 @@ let }; ExtUtilsConfig = buildPerlPackage { - name = "ExtUtils-Config-0.008"; + pname = "ExtUtils-Config"; + version = "0.008"; src = fetchurl { url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Config-0.008.tar.gz; sha256 = "ae5104f634650dce8a79b7ed13fb59d67a39c213a6776cfdaa3ee749e62f1a8c"; @@ -5417,15 +5823,17 @@ let }; ExtUtilsConstant = buildPerlPackage { - name = "ExtUtils-Constant-0.25"; + pname = "ExtUtils-Constant"; + version = "0.25"; src = fetchurl { url = mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.25.tar.gz; sha256 = "6933d0e963b62281ef7561068e6aecac8c4ac2b476b2bba09ab0b90fbac9d757"; }; }; - ExtUtilsCppGuess = buildPerlPackage rec { - name = "ExtUtils-CppGuess-0.19"; + ExtUtilsCppGuess = buildPerlPackage { + pname = "ExtUtils-CppGuess"; + version = "0.19"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.19.tar.gz; sha256 = "1lva59kq447wbpc5nnr0zvr6gczxrmi0r7l9r2kqx132nsx33ijc"; @@ -5436,7 +5844,8 @@ let }; ExtUtilsDepends = buildPerlPackage { - name = "ExtUtils-Depends-0.8000"; + pname = "ExtUtils-Depends"; + version = "0.8000"; src = fetchurl { url = mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.8000.tar.gz; sha256 = "165y1cjirbq64w39svkz82cb5jjqkjm8f4c0wqi2lk6050hzf3vq"; @@ -5447,7 +5856,8 @@ let }; ExtUtilsHelpers = buildPerlPackage { - name = "ExtUtils-Helpers-0.026"; + pname = "ExtUtils-Helpers"; + version = "0.026"; src = fetchurl { url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.026.tar.gz; sha256 = "05ilqcj1rg5izr09dsqmy5di4fvq6ph4k0chxks7qmd4j1kip46y"; @@ -5459,7 +5869,8 @@ let }; ExtUtilsInstall = buildPerlPackage { - name = "ExtUtils-Install-2.14"; + pname = "ExtUtils-Install"; + version = "2.14"; src = fetchurl { url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Install-2.14.tar.gz; sha256 = "35412305cbae979aac3b6e2c70cb301ae461979a1d848a8a043f74518eb96aea"; @@ -5471,7 +5882,8 @@ let }; ExtUtilsInstallPaths = buildPerlPackage { - name = "ExtUtils-InstallPaths-0.012"; + pname = "ExtUtils-InstallPaths"; + version = "0.012"; src = fetchurl { url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.012.tar.gz; sha256 = "1v9lshfhm9ck4p0v77arj5f7haj1mmkqal62lgzzvcds6wq5www4"; @@ -5483,10 +5895,11 @@ let }; }; - ExtUtilsLibBuilder = buildPerlModule rec { - name = "ExtUtils-LibBuilder-0.08"; + ExtUtilsLibBuilder = buildPerlModule { + pname = "ExtUtils-LibBuilder"; + version = "0.08"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AM/AMBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AM/AMBS/ExtUtils-LibBuilder-0.08.tar.gz; sha256 = "1lmmfcjxvsvhn4f3v2lyylgr8dzcf5j7mnd1pkq3jc75dph724f5"; }; perlPreHook = "export LD=$CC"; @@ -5497,7 +5910,8 @@ let }; ExtUtilsMakeMaker = buildPerlPackage { - name = "ExtUtils-MakeMaker-7.34"; + pname = "ExtUtils-MakeMaker"; + version = "7.34"; src = fetchurl { url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.34.tar.gz; sha256 = "95f1eb44de480d00b28d031b574ec868f7aeeee199eb5abe5666f6bcbbf68480"; @@ -5508,8 +5922,9 @@ let }; }; - ExtUtilsMakeMakerCPANfile = buildPerlPackage rec { - name = "ExtUtils-MakeMaker-CPANfile-0.09"; + ExtUtilsMakeMakerCPANfile = buildPerlPackage { + pname = "ExtUtils-MakeMaker-CPANfile"; + version = "0.09"; src = fetchurl { url = mirror://cpan/authors/id/I/IS/ISHIGAKI/ExtUtils-MakeMaker-CPANfile-0.09.tar.gz; sha256 = "0xg2z100vjhcndwaz9m3mmi90rb8h5pggpvlj1b0i8dhsh3pc1rc"; @@ -5521,18 +5936,20 @@ let }; }; - ExtUtilsManifest = buildPerlPackage rec { - name = "ExtUtils-Manifest-1.72"; + ExtUtilsManifest = buildPerlPackage { + pname = "ExtUtils-Manifest"; + version = "1.72"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/ExtUtils-Manifest-1.72.tar.gz; sha256 = "0pml5pfdk34nj9fa8m4f0qp1rh1yv0d54xagvxzjvvwq9w3q14kr"; }; }; - ExtUtilsPkgConfig = buildPerlPackage rec { - name = "ExtUtils-PkgConfig-1.16"; + ExtUtilsPkgConfig = buildPerlPackage { + pname = "ExtUtils-PkgConfig"; + version = "1.16"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + url = mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-PkgConfig-1.16.tar.gz; sha256 = "bbeaced995d7d8d10cfc51a3a5a66da41ceb2bc04fedcab50e10e6300e801c6e"; }; propagatedBuildInputs = [ pkgs.pkgconfig ]; @@ -5554,16 +5971,18 @@ let # 5.16. # # [1] https://metacpan.org/pod/release/SMUELLER/ExtUtils-Typemap-1.00/lib/ExtUtils/Typemap.pm: - ExtUtilsTypemap = buildPerlPackage rec { - name = "ExtUtils-Typemap-1.00"; + ExtUtilsTypemap = buildPerlPackage { + pname = "ExtUtils-Typemap"; + version = "1.00"; src = fetchurl { url = mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-Typemap-1.00.tar.gz; sha256 = "1iqz0xlscg655gnwb2h1wrjj70llblps1zznl29qn1mv5mvibc5i"; }; }; - ExtUtilsTypemapsDefault = buildPerlModule rec { - name = "ExtUtils-Typemaps-Default-1.05"; + ExtUtilsTypemapsDefault = buildPerlModule { + pname = "ExtUtils-Typemaps-Default"; + version = "1.05"; src = fetchurl { url = mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-Typemaps-Default-1.05.tar.gz; sha256 = "1phmha0ks95kvzl00r1kgnd5hvg7qb1q9jmzjmw01p5zgs1zbyix"; @@ -5571,7 +5990,8 @@ let }; ExtUtilsXSBuilder = buildPerlPackage { - name = "ExtUtils-XSBuilder-0.28"; + pname = "ExtUtils-XSBuilder"; + version = "0.28"; src = fetchurl { url = mirror://cpan/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.28.tar.gz; sha256 = "8cced386e3d544c5ec2deb3aed055b72ebcfc2ea9a6c807da87c4245272fe80a"; @@ -5579,8 +5999,9 @@ let propagatedBuildInputs = [ ParseRecDescent TieIxHash ]; }; - ExtUtilsXSpp = buildPerlModule rec { - name = "ExtUtils-XSpp-0.18"; + ExtUtilsXSpp = buildPerlModule { + pname = "ExtUtils-XSpp"; + version = "0.18"; src = fetchurl { url = mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-XSpp-0.18.tar.gz; sha256 = "1zx84f93lkymqz7qa4d63gzlnhnkxm5i3gvsrwkvvqr9cxjasxli"; @@ -5589,7 +6010,8 @@ let }; FatalException = buildPerlModule { - name = "Fatal-Exception-0.05"; + pname = "Fatal-Exception"; + version = "0.05"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Fatal-Exception-0.05.tar.gz; sha256 = "0kzfwc44vpxla3j637kfmnwmv57g6x4899ijqb4ljamk7whms298"; @@ -5598,16 +6020,18 @@ let propagatedBuildInputs = [ ExceptionDied ]; }; - FCGI = buildPerlPackage rec { - name = "FCGI-0.78"; + FCGI = buildPerlPackage { + pname = "FCGI"; + version = "0.78"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.78.tar.gz; sha256 = "1cxavhzg4gyw4gl9kirpbdimjr8gk1rjc3pqs3xrnh1gjybld5xa"; }; }; - FCGIClient = buildPerlModule rec { - name = "FCGI-Client-0.09"; + FCGIClient = buildPerlModule { + pname = "FCGI-Client"; + version = "0.09"; src = fetchurl { url = mirror://cpan/authors/id/T/TO/TOKUHIROM/FCGI-Client-0.09.tar.gz; sha256 = "1s11casbv0jmkcl5dk8i2vhfy1nc8rg43d3bg923zassrq4wndym"; @@ -5621,7 +6045,8 @@ let }; FCGIProcManager = buildPerlPackage { - name = "FCGI-ProcManager-0.28"; + pname = "FCGI-ProcManager"; + version = "0.28"; src = fetchurl { url = mirror://cpan/authors/id/A/AR/ARODLAND/FCGI-ProcManager-0.28.tar.gz; sha256 = "e1c958c042427a175e051e0008f2025e8ec80613d3c7750597bf8e529b04420e"; @@ -5632,7 +6057,8 @@ let }; FFICheckLib = buildPerlPackage { - name = "FFI-CheckLib-0.23"; + pname = "FFI-CheckLib"; + version = "0.23"; src = fetchurl { url = mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.23.tar.gz; sha256 = "0rjivas0rsp7d5599cjcxss80zfj7a5b8did771dlw7h2p5apisf"; @@ -5645,7 +6071,8 @@ let }; FennecLite = buildPerlModule { - name = "Fennec-Lite-0.004"; + pname = "Fennec-Lite"; + version = "0.004"; src = fetchurl { url = mirror://cpan/authors/id/E/EX/EXODIST/Fennec-Lite-0.004.tar.gz; sha256 = "dce28e3932762c2ff92aa52d90405c06e898e81cb7b164ccae8966ae77f1dcab"; @@ -5658,7 +6085,8 @@ let }; FileChangeNotify = buildPerlPackage { - name = "File-ChangeNotify-0.31"; + pname = "File-ChangeNotify"; + version = "0.31"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/File-ChangeNotify-0.31.tar.gz; sha256 = "192bdb1ce76266c6a694a8e962d039e3adeeb829b6ac1e23f5057f2b506392bd"; @@ -5671,17 +6099,18 @@ let }; }; - Filechdir = buildPerlPackage rec { - name = "File-chdir-0.1010"; + Filechdir = buildPerlPackage { + pname = "File-chdir"; + version = "0.1010"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1010.tar.gz; sha256 = "009b8p2fzj4nhl03fpkhrn0rsh7myxqbrf69iqpzd86p1gs23hgg"; }; }; - FileBaseDir = buildPerlModule rec { + FileBaseDir = buildPerlModule { version = "0.08"; - name = "File-BaseDir-${version}"; + pname = "File-BaseDir"; src = fetchurl { url = mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz; sha256 = "c065fcd3e2f22ae769937bcc971b91f80294d5009fac140bfba83bf7d35305e3"; @@ -5694,10 +6123,11 @@ let buildInputs = [ FileWhich ]; }; - FileBOM = buildPerlModule rec { - name = "File-BOM-0.16"; + FileBOM = buildPerlModule { + pname = "File-BOM"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MATTLAW/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MATTLAW/File-BOM-0.16.tar.gz; sha256 = "97091a72bb1d3a7b5cac1dfb5372962b6f8055729189d0f3fd2c959c8ff374cf"; }; buildInputs = [ TestException ]; @@ -5709,7 +6139,8 @@ let }; FileCheckTree = buildPerlPackage { - name = "File-CheckTree-4.42"; + pname = "File-CheckTree"; + version = "4.42"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/File-CheckTree-4.42.tar.gz; sha256 = "66fb417f8ff8a5e5b7ea25606156e70e204861c59fa8c3831925b4dd3f155f8a"; @@ -5720,17 +6151,19 @@ let }; }; - FileCopyRecursive = buildPerlPackage rec { - name = "File-Copy-Recursive-0.44"; + FileCopyRecursive = buildPerlPackage { + pname = "File-Copy-Recursive"; + version = "0.44"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DM/DMUEY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.44.tar.gz; sha256 = "1r3frbl61kr7ig9bzd60fka772cd504v3kx9kgnwvcy1inss06df"; }; buildInputs = [ PathTiny TestDeep TestFatal TestFile TestWarnings ]; }; - FileCopyRecursiveReduced = buildPerlPackage rec { - name = "File-Copy-Recursive-Reduced-0.006"; + FileCopyRecursiveReduced = buildPerlPackage { + pname = "File-Copy-Recursive-Reduced"; + version = "0.006"; src = fetchurl { url = mirror://cpan/authors/id/J/JK/JKEENAN/File-Copy-Recursive-Reduced-0.006.tar.gz; sha256 = "0b3yf33bahaf4ipfqipn8y5z4296k3vgzzsqbhh5ahwzls9zj676"; @@ -5743,9 +6176,9 @@ let }; }; - FileDesktopEntry = buildPerlPackage rec { + FileDesktopEntry = buildPerlPackage { version = "0.22"; - name = "File-DesktopEntry-${version}"; + pname = "File-DesktopEntry"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MICHIELB/File-DesktopEntry-0.22.tar.gz; sha256 = "169c01e3dae2f629767bec1a9f1cdbd6ec6d713d1501e0b2786e4dd1235635b8"; @@ -5754,7 +6187,8 @@ let }; FileFindIterator = buildPerlPackage { - name = "File-Find-Iterator-0.4"; + pname = "File-Find-Iterator"; + version = "0.4"; src = fetchurl { url = mirror://cpan/authors/id/T/TE/TEXMEC/File-Find-Iterator-0.4.tar.gz; sha256 = "a2b87ab9756a2e5bb674adbd39937663ed20c28c716bf5a1095a3ca44d54ab2c"; @@ -5764,8 +6198,9 @@ let }; }; - FileFindObject = buildPerlModule rec { - name = "File-Find-Object-0.3.2"; + FileFindObject = buildPerlModule { + pname = "File-Find-Object"; + version = "0.3.2"; src = fetchurl { url = mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-v0.3.2.tar.gz; sha256 = "7c467b6b7752bff46b7b8b84c9aabeac45bbfdab1e2224108a2e2170adb9f2b7"; @@ -5777,10 +6212,11 @@ let }; }; - FileFindObjectRule = buildPerlModule rec { - name = "File-Find-Object-Rule-0.0310"; + FileFindObjectRule = buildPerlModule { + pname = "File-Find-Object-Rule"; + version = "0.0310"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-Rule-0.0310.tar.gz; sha256 = "f1f1820ff44042f6b30e4d6be1db860b9e743b1a9836070ea656ad9829e4eca5"; }; propagatedBuildInputs = [ FileFindObject NumberCompare TextGlob ]; @@ -5791,17 +6227,19 @@ let }; }; - FileFindRule = buildPerlPackage rec { - name = "File-Find-Rule-0.34"; + FileFindRule = buildPerlPackage { + pname = "File-Find-Rule"; + version = "0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RC/RCLAMP/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RC/RCLAMP/File-Find-Rule-0.34.tar.gz; sha256 = "1znachnhmi1w5pdqx8dzgfa892jb7x8ivrdy4pzjj7zb6g61cvvy"; }; propagatedBuildInputs = [ NumberCompare TextGlob ]; }; FileFindRulePerl = buildPerlPackage { - name = "File-Find-Rule-Perl-1.15"; + pname = "File-Find-Rule-Perl"; + version = "1.15"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/File-Find-Rule-Perl-1.15.tar.gz; sha256 = "9a48433f86e08ce18e03526e2982de52162eb909d19735460f07eefcaf463ea6"; @@ -5813,10 +6251,11 @@ let }; }; - FileFinder = buildPerlPackage rec { - name = "File-Finder-0.53"; + FileFinder = buildPerlPackage { + pname = "File-Finder"; + version = "0.53"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ME/MERLYN/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/ME/MERLYN/File-Finder-0.53.tar.gz; sha256 = "2ecbc19ac67a9e635c872a807a8d3eaaff5babc054f15a191d47cdfc5f176a74"; }; propagatedBuildInputs = [ TextGlob ]; @@ -5825,8 +6264,9 @@ let }; }; - FileFnMatch = buildPerlPackage rec { - name = "File-FnMatch-0.02"; + FileFnMatch = buildPerlPackage { + pname = "File-FnMatch"; + version = "0.02"; src = fetchurl { url = "mirror://cpan/authors/id/M/MJ/MJP/File-FnMatch-0.02.tar.gz"; sha256 = "05p9m7kpmjv8bmmbs5chb5fqyshcgmskbbzq5c9qpskbx2w5894n"; @@ -5838,10 +6278,11 @@ let }; }; - FileHandleUnget = buildPerlPackage rec { - name = "FileHandle-Unget-0.1634"; + FileHandleUnget = buildPerlPackage { + pname = "FileHandle-Unget"; + version = "0.1634"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DC/DCOPPIT/FileHandle-Unget-0.1634.tar.gz; sha256 = "380f34ad3ce5e9ec661d4c468bb3392231c162317d4172df378146b42aab1785"; }; buildInputs = [ FileSlurper TestCompile UNIVERSALrequire URI ]; @@ -5854,7 +6295,8 @@ let }; FileHomeDir = buildPerlPackage { - name = "File-HomeDir-1.004"; + pname = "File-HomeDir"; + version = "1.004"; src = fetchurl { url = mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.004.tar.gz; sha256 = "45f67e2bb5e60a7970d080e8f02079732e5a8dfc0c7c3cbdb29abfb3f9f791ad"; @@ -5868,19 +6310,21 @@ let doCheck = !stdenv.isDarwin; }; - FileKeePass = buildPerlPackage rec { - name = "File-KeePass-2.03"; + FileKeePass = buildPerlPackage { + pname = "File-KeePass"; + version = "2.03"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RH/RHANDOM/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RH/RHANDOM/File-KeePass-2.03.tar.gz; sha256 = "c30c688027a52ff4f58cd69d6d8ef35472a7cf106d4ce94eb73a796ba7c7ffa7"; }; propagatedBuildInputs = [ CryptRijndael ]; }; - Filelchown = buildPerlModule rec { - name = "File-lchown-0.02"; + Filelchown = buildPerlModule { + pname = "File-lchown"; + version = "0.02"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PE/PEVANS/File-lchown-0.02.tar.gz; sha256 = "a02fbf285406a8a4d9399284f032f2d55c56975154c2e1674bd109837b8096ec"; }; buildInputs = [ ExtUtilsCChecker ]; @@ -5890,10 +6334,11 @@ let }; }; - FileLibMagic = buildPerlPackage rec { - name = "File-LibMagic-1.16"; + FileLibMagic = buildPerlPackage { + pname = "File-LibMagic"; + version = "1.16"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/File-LibMagic-1.16.tar.gz; sha256 = "c8a695fac1454f52e18e2e1b624c0647cf117326014023dda69fa3e1a5f33d60"; }; buildInputs = [ pkgs.file TestFatal ]; @@ -5908,8 +6353,9 @@ let }; }; - FileListing = buildPerlPackage rec { - name = "File-Listing-6.04"; + FileListing = buildPerlPackage { + pname = "File-Listing"; + version = "6.04"; src = fetchurl { url = mirror://cpan/authors/id/G/GA/GAAS/File-Listing-6.04.tar.gz; sha256 = "1xcwjlnxaiwwpn41a5yi6nz95ywh3szq5chdxiwj36kqsvy5000y"; @@ -5917,8 +6363,9 @@ let propagatedBuildInputs = [ HTTPDate ]; }; - FileMimeInfo = buildPerlPackage rec { - name = "File-MimeInfo-0.29"; + FileMimeInfo = buildPerlPackage { + pname = "File-MimeInfo"; + version = "0.29"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.29.tar.gz; sha256 = "1sh8r6vczyz08zm8vfsjmkg6a165wch54akjdrd1vbifcmwjg5pi"; @@ -5927,10 +6374,11 @@ let buildInputs = [ FileBaseDir FileDesktopEntry ]; }; - FileMMagic = buildPerlPackage rec { - name = "File-MMagic-1.30"; + FileMMagic = buildPerlPackage { + pname = "File-MMagic"; + version = "1.30"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KN/KNOK/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KN/KNOK/File-MMagic-1.30.tar.gz; sha256 = "cf0c1b1eb29705c02d97c2913648009c0be42ce93ec24b36c696bf2d4f5ebd7e"; }; meta = { @@ -5939,10 +6387,11 @@ let }; }; - FileModified = buildPerlPackage rec { - name = "File-Modified-0.10"; + FileModified = buildPerlPackage { + pname = "File-Modified"; + version = "0.10"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NE/NEILB/File-Modified-0.10.tar.gz; sha256 = "6b50b1aab6ec6998a017f6403c2735b3bc1e1cf46187bd134d7eb6df3fc45144"; }; meta = { @@ -5952,24 +6401,27 @@ let }; }; - FileNext = buildPerlPackage rec { - name = "File-Next-1.16"; + FileNext = buildPerlPackage { + pname = "File-Next"; + version = "1.16"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/File-Next-1.16.tar.gz; sha256 = "0nfp84p63a5xm6iwlckh3f6cy9bdpjw5fazplskhnb8k5ifg4rb9"; }; }; FileNFSLock = buildPerlPackage { - name = "File-NFSLock-1.29"; + pname = "File-NFSLock"; + version = "1.29"; src = fetchurl { url = mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.29.tar.gz; sha256 = "0dzssj15faz9cn1w3xi7jwm64gyjyazapv4bkgglw5l1njcibm31"; }; }; - FilePath = buildPerlPackage rec { - name = "File-Path-2.16"; + FilePath = buildPerlPackage { + pname = "File-Path"; + version = "2.16"; src = fetchurl { url = mirror://cpan/authors/id/J/JK/JKEENAN/File-Path-2.16.tar.gz; sha256 = "21f7d69b59c381f459c5f0bf697d512109bd911f12ca33270b70ca9a9ef6fa05"; @@ -5980,10 +6432,11 @@ let }; }; - FilePid = buildPerlPackage rec { - name = "File-Pid-1.01"; + FilePid = buildPerlPackage { + pname = "File-Pid"; + version = "1.01"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CW/CWEST/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CW/CWEST/File-Pid-1.01.tar.gz; sha256 = "bafeee8fdc96eb06306a0c58bbdb7209b6de45f850e75fdc6b16db576e05e422"; }; propagatedBuildInputs = [ ClassAccessor ]; @@ -5995,7 +6448,8 @@ let }; Filepushd = buildPerlPackage { - name = "File-pushd-1.016"; + pname = "File-pushd"; + version = "1.016"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.016.tar.gz; sha256 = "d73a7f09442983b098260df3df7a832a5f660773a313ca273fa8b56665f97cdc"; @@ -6006,10 +6460,11 @@ let }; }; - FileReadBackwards = buildPerlPackage rec { - name = "File-ReadBackwards-1.05"; + FileReadBackwards = buildPerlPackage { + pname = "File-ReadBackwards"; + version = "1.05"; src = fetchurl { - url = "mirror://cpan/authors/id/U/UR/URI/${name}.tar.gz"; + url = mirror://cpan/authors/id/U/UR/URI/File-ReadBackwards-1.05.tar.gz; sha256 = "82b261af87507cc3e7e66899c457104ebc8d1c09fb85c53f67c1f90f70f18d6e"; }; meta = { @@ -6018,8 +6473,9 @@ let }; }; - FileRemove = buildPerlModule rec { - name = "File-Remove-1.58"; + FileRemove = buildPerlModule { + pname = "File-Remove"; + version = "1.58"; src = fetchurl { url = mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.58.tar.gz; sha256 = "1n6h5w3sp2bs4cfrifdx2z15cfpb4r536179mx1a12xbmj1yrxl1"; @@ -6027,7 +6483,8 @@ let }; FileShare = buildPerlPackage { - name = "File-Share-0.25"; + pname = "File-Share"; + version = "0.25"; src = fetchurl { url = mirror://cpan/authors/id/I/IN/INGY/File-Share-0.25.tar.gz; sha256 = "0w3h800qqcf1sn79h84zngnn788rg2jx4jjb70l44f6419p2b7cf"; @@ -6041,7 +6498,8 @@ let }; FileShareDir = buildPerlPackage { - name = "File-ShareDir-1.116"; + pname = "File-ShareDir"; + version = "1.116"; src = fetchurl { url = mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.116.tar.gz; sha256 = "0a43rfb0a1fpxh4d2dayarkdxw4cx9a2krkk87zmcilcz7yhpnar"; @@ -6055,7 +6513,8 @@ let }; FileShareDirInstall = buildPerlPackage { - name = "File-ShareDir-Install-0.13"; + pname = "File-ShareDir-Install"; + version = "0.13"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/File-ShareDir-Install-0.13.tar.gz; sha256 = "1yc0wlkav2l2wr36a53n4mnhsy2zv29z5nm14mygxgjwv7qgvgj5"; @@ -6066,10 +6525,11 @@ let }; }; - FilesysDf = buildPerlPackage rec { - name = "Filesys-Df-0.92"; + FilesysDf = buildPerlPackage { + pname = "Filesys-Df"; + version = "0.92"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IG/IGUTHRIE/${name}.tar.gz"; + url = mirror://cpan/authors/id/I/IG/IGUTHRIE/Filesys-Df-0.92.tar.gz; sha256 = "fe89cbb427e0e05f1cd97c2dd6d3866ac6b21bc7a85734ede159bdc35479552a"; }; meta = { @@ -6079,7 +6539,8 @@ let }; FilesysNotifySimple = buildPerlPackage { - name = "Filesys-Notify-Simple-0.13"; + pname = "Filesys-Notify-Simple"; + version = "0.13"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Filesys-Notify-Simple-0.13.tar.gz; sha256 = "18jv96k1pf8wqf4vn2ahs7dv44lc9cyqj0bja9z17qici3dx7qxd"; @@ -6091,10 +6552,11 @@ let buildInputs = [ TestSharedFork ]; }; - FilesysDiskUsage = buildPerlPackage rec { - name = "Filesys-DiskUsage-0.12"; + FilesysDiskUsage = buildPerlPackage { + pname = "Filesys-DiskUsage"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MANWAR/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MANWAR/Filesys-DiskUsage-0.12.tar.gz; sha256 = "e8afee07014df5868f9a2784e041c82c3c8c38550f4cd48bec56d0d6c4997273"; }; buildInputs = [ TestWarn ]; @@ -6105,7 +6567,8 @@ let }; FileSlurp = buildPerlPackage { - name = "File-Slurp-9999.27"; + pname = "File-Slurp"; + version = "9999.27"; src = fetchurl { url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.27.tar.gz; sha256 = "1x233kj1qifvii7j8d4wzarwhj5z11vnpxsqvdm98dsccr7qi79s"; @@ -6116,10 +6579,11 @@ let }; }; - FileSlurper = buildPerlPackage rec { - name = "File-Slurper-0.012"; + FileSlurper = buildPerlPackage { + pname = "File-Slurper"; + version = "0.012"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; + url = mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.012.tar.gz; sha256 = "4efb2ea416b110a1bda6f8133549cc6ea3676402e3caf7529fce0313250aa578"; }; buildInputs = [ TestWarnings ]; @@ -6129,10 +6593,11 @@ let }; }; - FileSlurpTiny = buildPerlPackage rec { - name = "File-Slurp-Tiny-0.004"; + FileSlurpTiny = buildPerlPackage { + pname = "File-Slurp-Tiny"; + version = "0.004"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; + url = mirror://cpan/authors/id/L/LE/LEONT/File-Slurp-Tiny-0.004.tar.gz; sha256 = "452995beeabf0e923e65fdc627a725dbb12c9e10c00d8018c16d10ba62757f1e"; }; meta = { @@ -6141,10 +6606,11 @@ let }; }; - FileTail = buildPerlPackage rec { - name = "File-Tail-1.3"; + FileTail = buildPerlPackage { + pname = "File-Tail"; + version = "1.3"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MG/MGRABNAR/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MG/MGRABNAR/File-Tail-1.3.tar.gz; sha256 = "1ixg6kn4h330xfw3xgvqcbzfc3v2wlzjim9803jflhvfhf0rzl16"; }; meta = { @@ -6155,7 +6621,8 @@ let }; FileTemp = buildPerlPackage { - name = "File-Temp-0.2309"; + pname = "File-Temp"; + version = "0.2309"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2309.tar.gz; sha256 = "0pr3wrxrk93wy7dz9gsb1sgl77icrs8rh2mah6wms5cdi2ll5ch1"; @@ -6167,10 +6634,11 @@ let }; }; - FileTouch = buildPerlPackage rec { - name = "File-Touch-0.11"; + FileTouch = buildPerlPackage { + pname = "File-Touch"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NE/NEILB/File-Touch-0.11.tar.gz; sha256 = "e379a5ff89420cf39906e5ceff309b8ce958f99f9c3e57ad52b5002a3982d93c"; }; meta = { @@ -6182,7 +6650,8 @@ let }; FileType = buildPerlModule { - name = "File-Type-0.22"; + pname = "File-Type"; + version = "0.22"; src = fetchurl { url = mirror://cpan/authors/id/P/PM/PMISON/File-Type-0.22.tar.gz; sha256 = "0hfkaafp6wb0nw19x47wc6wc9mwlw8s2rxiii3ylvzapxxgxjp6k"; @@ -6193,10 +6662,11 @@ let }; }; - FileUtil = buildPerlModule rec { - name = "File-Util-4.161950"; + FileUtil = buildPerlModule { + pname = "File-Util"; + version = "4.161950"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOMMY/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TO/TOMMY/File-Util-4.161950.tar.gz; sha256 = "88507b19da580d595b5c25fe6ba75bbd6096b4359e389ead067a216f766c20ee"; }; buildInputs = [ TestNoWarnings ]; @@ -6207,10 +6677,11 @@ let }; }; - FileWhich = buildPerlPackage rec { - name = "File-Which-1.23"; + FileWhich = buildPerlPackage { + pname = "File-Which"; + version = "1.23"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/File-Which-1.23.tar.gz; sha256 = "b79dc2244b2d97b6f27167fc3b7799ef61a179040f3abd76ce1e0a3b0bc4e078"; }; meta = { @@ -6220,8 +6691,9 @@ let }; }; - FileZglob = buildPerlPackage rec { - name = "File-Zglob-0.11"; + FileZglob = buildPerlPackage { + pname = "File-Zglob"; + version = "0.11"; src = fetchurl { url = mirror://cpan/authors/id/T/TO/TOKUHIROM/File-Zglob-0.11.tar.gz; sha256 = "16v61rn0yimpv5kp6b20z2f1c93n5kpsyjvr0gq4w2dc43gfvc8w"; @@ -6233,7 +6705,8 @@ let }; Filter = buildPerlPackage { - name = "Filter-1.59"; + pname = "Filter"; + version = "1.59"; src = fetchurl { url = mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.59.tar.gz; sha256 = "b4babfad4e0566a9a61199735f6e622a60d3274122752304f18f623412bf4e5a"; @@ -6244,10 +6717,11 @@ let }; }; - FinanceQuote = buildPerlPackage rec { - name = "Finance-Quote-1.47"; + FinanceQuote = buildPerlPackage { + pname = "Finance-Quote"; + version = "1.47"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EC/ECOCODE/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/EC/ECOCODE/Finance-Quote-1.47.tar.gz; sha256 = "0gzbq85738f299jaw4nj3ljnka380j2y6yspmyl71rgfypqjvbr7"; }; propagatedBuildInputs = [ CGI DateTime HTMLTableExtract JSON LWPProtocolHttps ]; @@ -6258,18 +6732,20 @@ let }; }; - FontAFM = buildPerlPackage rec { - name = "Font-AFM-1.20"; + FontAFM = buildPerlPackage { + pname = "Font-AFM"; + version = "1.20"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GA/GAAS/Font-AFM-1.20.tar.gz; sha256 = "32671166da32596a0f6baacd0c1233825a60acaf25805d79c81a3f18d6088bc1"; }; }; - FontTTF = buildPerlPackage rec { - name = "Font-TTF-1.06"; + FontTTF = buildPerlPackage { + pname = "Font-TTF"; + version = "1.06"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BH/BHALLISSY/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BH/BHALLISSY/Font-TTF-1.06.tar.gz; sha256 = "4b697d444259759ea02d2c442c9bffe5ffe14c9214084a01f743693a944cc293"; }; meta = { @@ -6280,7 +6756,8 @@ let }; ForksSuper = buildPerlPackage { - name = "Forks-Super-0.97"; + pname = "Forks-Super"; + version = "0.97"; src = fetchurl { url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.97.tar.gz; sha256 = "0kias11b4zchxy5x9ns2wwjzvzxlzsbap8sq587z9micw5bl7nrk"; @@ -6293,10 +6770,11 @@ let propagatedBuildInputs = [ URI ]; }; - FormValidatorSimple = buildPerlPackage rec { - name = "FormValidator-Simple-0.29"; + FormValidatorSimple = buildPerlPackage { + pname = "FormValidator-Simple"; + version = "0.29"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LY/LYOKATO/${name}.tar.gz"; + url = mirror://cpan/authors/id/L/LY/LYOKATO/FormValidator-Simple-0.29.tar.gz; sha256 = "fc3a63dc54b962d74586070176adaf5be869f09b561bb30f5fd32ef531792666"; }; propagatedBuildInputs = [ ClassAccessor ClassDataAccessor DateCalc DateTimeFormatStrptime EmailValidLoose ListMoreUtils TieIxHash UNIVERSALrequire YAML ]; @@ -6308,7 +6786,8 @@ let }; FreezeThaw = buildPerlPackage { - name = "FreezeThaw-0.5001"; + pname = "FreezeThaw"; + version = "0.5001"; src = fetchurl { url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.5001.tar.gz; sha256 = "0h8gakd6b9770n2xhld1hhqghdar3hrq2js4mgiwxy86j4r0hpiw"; @@ -6317,7 +6796,8 @@ let }; GamesSolitaireVerify = buildPerlModule { - name = "Games-Solitaire-Verify-0.2000"; + pname = "Games-Solitaire-Verify"; + version = "0.2000"; src = fetchurl { url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.2000.tar.gz; sha256 = "dc87a348a2cacfadfb8205ff3fdbc138f475126bef175bc806ec9454285c2165"; @@ -6330,8 +6810,9 @@ let }; }; - GD = buildPerlPackage rec { - name = "GD-2.71"; + GD = buildPerlPackage { + pname = "GD"; + version = "2.71"; src = fetchurl { url = mirror://cpan/authors/id/R/RU/RURBAN/GD-2.71.tar.gz; sha256 = "1ivskdb4nwy7ky37369hwkfxp11fkp6ri5k7qlf2dmra7f3y86s5"; @@ -6345,8 +6826,9 @@ let makeMakerFlags = "--lib_png_path=${pkgs.libpng.out} --lib_jpeg_path=${pkgs.libjpeg.out} --lib_zlib_path=${pkgs.zlib.out} --lib_ft_path=${pkgs.freetype.out} --lib_fontconfig_path=${pkgs.fontconfig.lib} --lib_xpm_path=${pkgs.xorg.libXpm.out}"; }; - GDGraph = buildPerlPackage rec { - name = "GDGraph-1.54"; + GDGraph = buildPerlPackage { + pname = "GDGraph"; + version = "1.54"; src = fetchurl { url = mirror://cpan/authors/id/R/RU/RUZ/GDGraph-1.54.tar.gz; sha256 = "0kzsdc07ycxjainmz0dnsclb15w2j1y7g8b5mcb7vhannq85qvxr"; @@ -6360,7 +6842,8 @@ let }; GDSecurityImage = buildPerlPackage { - name = "GD-SecurityImage-1.75"; + pname = "GD-SecurityImage"; + version = "1.75"; src = fetchurl { url = mirror://cpan/authors/id/B/BU/BURAK/GD-SecurityImage-1.75.tar.gz; sha256 = "19lf1kzdavrkkx3f900jnpynr55d5kjd2sdmwpfir5dsmkcj9pix"; @@ -6372,8 +6855,9 @@ let }; }; - GDText = buildPerlPackage rec { - name = "GDTextUtil-0.86"; + GDText = buildPerlPackage { + pname = "GDTextUtil"; + version = "0.86"; src = fetchurl { url = mirror://cpan/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz; sha256 = "1g0nc7fz4d672ag7brlrrcz7ibm98x49qs75bq9z957ybkwcnvl8"; @@ -6384,10 +6868,11 @@ let }; }; - GeoIP = buildPerlPackage rec { - name = "Geo-IP-1.51"; + GeoIP = buildPerlPackage { + pname = "Geo-IP"; + version = "1.51"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MAXMIND/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MAXMIND/Geo-IP-1.51.tar.gz; sha256 = "1fka8fr7fw6sh3xa9glhs1zjg3s2gfkhi7n7da1l2m2wblqj0c0n"; }; makeMakerFlags = "LIBS=-L${pkgs.geoip}/lib INC=-I${pkgs.geoip}/include"; @@ -6395,7 +6880,8 @@ let }; GeoIP2 = buildPerlPackage { - name = "GeoIP2-2.006001"; + pname = "GeoIP2"; + version = "2.006001"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MAXMIND/GeoIP2-2.006001.tar.gz; sha256 = "05pb8bj2dkfcn8z56f8dcs76x65xcn05fywm7vifmfh39qgkmm62"; @@ -6408,10 +6894,11 @@ let }; }; - GetoptArgvFile = buildPerlPackage rec { - name = "Getopt-ArgvFile-1.11"; + GetoptArgvFile = buildPerlPackage { + pname = "Getopt-ArgvFile"; + version = "1.11"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JS/JSTENZEL/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JS/JSTENZEL/Getopt-ArgvFile-1.11.tar.gz; sha256 = "3709aa513ce6fd71d1a55a02e34d2f090017d5350a9bd447005653c9b0835b22"; }; meta = { @@ -6420,18 +6907,20 @@ let }; }; - GetoptLong = buildPerlPackage rec { - name = "Getopt-Long-2.50"; + GetoptLong = buildPerlPackage { + pname = "Getopt-Long"; + version = "2.50"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JV/JV/Getopt-Long-2.50.tar.gz; sha256 = "0rsb7ri8210xv09mnxykw5asbcqivd0v38x0z4jkis3k5gdim210"; }; }; - GetoptLongDescriptive = buildPerlPackage rec { - name = "Getopt-Long-Descriptive-0.102"; + GetoptLongDescriptive = buildPerlPackage { + pname = "Getopt-Long-Descriptive"; + version = "0.102"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.102.tar.gz; sha256 = "9ad4b98f294aa0515cc3150a1ae878d39e470762b78d8bd9df055eba9dea2846"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; @@ -6443,18 +6932,20 @@ let }; }; - GetoptTabular = buildPerlPackage rec { - name = "Getopt-Tabular-0.3"; + GetoptTabular = buildPerlPackage { + pname = "Getopt-Tabular"; + version = "0.3"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GW/GWARD/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GW/GWARD/Getopt-Tabular-0.3.tar.gz; sha256 = "0xskl9lcj07sdfx5dkma5wvhhgf5xlsq0khgh8kk34dm6dv0dpwv"; }; }; - Git = buildPerlPackage rec { - name = "Git-0.42"; + Git = buildPerlPackage { + pname = "Git"; + version = "0.42"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSOUTH/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MS/MSOUTH/Git-0.42.tar.gz; sha256 = "9469a9f398f3a2bf2b0500566ee41d3ff6fae460412a137185767a1cc4783a6d"; }; propagatedBuildInputs = [ Error ]; @@ -6465,10 +6956,11 @@ let }; }; - GitPurePerl = buildPerlPackage rec { - name = "Git-PurePerl-0.53"; + GitPurePerl = buildPerlPackage { + pname = "Git-PurePerl"; + version = "0.53"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BR/BROQ/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BR/BROQ/Git-PurePerl-0.53.tar.gz; sha256 = "987c74366cc4c37ee084050f985fa254359c89c12507f5b8bfc6607de538d5a8"; }; buildInputs = [ Testutf8 ]; @@ -6480,10 +6972,11 @@ let }; }; - GitRepository = buildPerlPackage rec { - name = "Git-Repository-1.323"; + GitRepository = buildPerlPackage { + pname = "Git-Repository"; + version = "1.323"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOOK/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BO/BOOK/Git-Repository-1.323.tar.gz; sha256 = "966575fcecc9f56ab8739ea451b3825e278bc9179d785a20a9ae52473f33683e"; }; buildInputs = [ TestRequiresGit ]; @@ -6494,10 +6987,11 @@ let }; }; - GitVersionCompare = buildPerlPackage rec { - name = "Git-Version-Compare-1.004"; + GitVersionCompare = buildPerlPackage { + pname = "Git-Version-Compare"; + version = "1.004"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOOK/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BO/BOOK/Git-Version-Compare-1.004.tar.gz; sha256 = "63e8264ed351cb2371b47852a72366214164b5f3fad9dbd68309c7fc63d06491"; }; buildInputs = [ TestNoWarnings ]; @@ -6507,10 +7001,11 @@ let }; }; - Glib = buildPerlPackage rec { - name = "Glib-1.329"; + Glib = buildPerlPackage { + pname = "Glib"; + version = "1.329"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + url = mirror://cpan/authors/id/X/XA/XAOC/Glib-1.329.tar.gz; sha256 = "0d9ak0zknz81lv3cqkzr2mxdic6g5rrbb87skqc4jj48rz4f2k3v"; }; buildInputs = [ pkgs.glib ]; @@ -6523,10 +7018,11 @@ let propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ]; }; - GlibObjectIntrospection = buildPerlPackage rec { - name = "Glib-Object-Introspection-0.047"; + GlibObjectIntrospection = buildPerlPackage { + pname = "Glib-Object-Introspection"; + version = "0.047"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + url = mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.047.tar.gz; sha256 = "1sk32pcv4ik3sniqbjrz8nlw7f2a76l87wx1rwdjypv6h9pjnrnk"; }; propagatedBuildInputs = [ pkgs.gobject-introspection Glib ]; @@ -6536,10 +7032,11 @@ let }; }; - Gnome2 = buildPerlPackage rec { - name = "Gnome2-1.047"; + Gnome2 = buildPerlPackage { + pname = "Gnome2"; + version = "1.047"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + url = mirror://cpan/authors/id/X/XA/XAOC/Gnome2-1.047.tar.gz; sha256 = "ccc85c5dc3c14f915ed1a186d238681d83fef3d17eed1c20001499ff56b6390c"; }; buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gnome2Canvas Gnome2VFS Gtk2 ]; @@ -6551,10 +7048,11 @@ let }; }; - Gnome2Canvas = buildPerlPackage rec { - name = "Gnome2-Canvas-1.002"; + Gnome2Canvas = buildPerlPackage { + pname = "Gnome2-Canvas"; + version = "1.002"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TS/TSCH/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Canvas-1.002.tar.gz; sha256 = "47a34204cd5f3a0ef5c8b9e1c9c96f41740edab7e9abf1d0560fa8666ba1916e"; }; buildInputs = [ pkgs.gnome2.libgnomecanvas ]; @@ -6564,10 +7062,11 @@ let propagatedBuildInputs = [ Gtk2 Pango ]; }; - Gnome2VFS = buildPerlPackage rec { - name = "Gnome2-VFS-1.083"; + Gnome2VFS = buildPerlPackage { + pname = "Gnome2-VFS"; + version = "1.083"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + url = mirror://cpan/authors/id/X/XA/XAOC/Gnome2-VFS-1.083.tar.gz; sha256 = "eca974669df4e7f21b4fcedb96c8a328422369c68b8c2cd99b9ce9cc5d7a7979"; }; propagatedBuildInputs = [ pkgs.gnome2.gnome_vfs Glib ]; @@ -6577,10 +7076,11 @@ let }; }; - Gnome2Wnck = buildPerlPackage rec { - name = "Gnome2-Wnck-0.16"; + Gnome2Wnck = buildPerlPackage { + pname = "Gnome2-Wnck"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TS/TSCH/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.tar.gz; sha256 = "604a8ece88ac29f132d59b0caac27657ec31371c1606a4698a2160e88ac586e5"; }; buildInputs = [ pkgs.libwnck pkgs.glib pkgs.gtk2 ]; @@ -6592,7 +7092,8 @@ let }; GnuPG = buildPerlPackage { - name = "GnuPG-0.19"; + pname = "GnuPG"; + version = "0.19"; src = fetchurl { url = mirror://cpan/authors/id/Y/YA/YANICK/GnuPG-0.19.tar.gz; sha256 = "af53f2d3f63297e046676eae14a76296afdd2910e09723b6b113708622b7989b"; @@ -6600,10 +7101,11 @@ let buildInputs = [ pkgs.gnupg1orig ]; }; - GnuPGInterface = buildPerlPackage rec { - name = "GnuPG-Interface-0.52"; + GnuPGInterface = buildPerlPackage { + pname = "GnuPG-Interface"; + version = "0.52"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AL/ALEXMV/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AL/ALEXMV/GnuPG-Interface-0.52.tar.gz; sha256 = "247a9f5a88bb6745281c00d0f7d5d94e8599a92396849fd9571356dda047fd35"; }; buildInputs = [ pkgs.which pkgs.gnupg1compat ]; @@ -6616,7 +7118,8 @@ let }; GoferTransporthttp = buildPerlPackage { - name = "GoferTransport-http-1.017"; + pname = "GoferTransport-http"; + version = "1.017"; src = fetchurl { url = mirror://cpan/authors/id/T/TI/TIMB/GoferTransport-http-1.017.tar.gz; sha256 = "f73effe3ea7afa1907ce8977c87387abb0d4404f85a724ae2637b29a73154a9b"; @@ -6628,10 +7131,11 @@ let }; }; - GooCanvas = buildPerlPackage rec { - name = "Goo-Canvas-0.06"; + GooCanvas = buildPerlPackage { + pname = "Goo-Canvas"; + version = "0.06"; src = fetchurl { - url = "mirror://cpan/authors/id/Y/YE/YEWENBIN/${name}.tar.gz"; + url = mirror://cpan/authors/id/Y/YE/YEWENBIN/Goo-Canvas-0.06.tar.gz; sha256 = "0c588c507eed5e62d12ed1cc1e491c6ff3a1f59c4fb3d435e14214b37ab39251"; }; propagatedBuildInputs = [ pkgs.goocanvas pkgs.gtk2 Gtk2 Pango ]; @@ -6641,10 +7145,11 @@ let }; }; - GooCanvas2 = buildPerlPackage rec { - name = "GooCanvas2-0.06"; + GooCanvas2 = buildPerlPackage { + pname = "GooCanvas2"; + version = "0.06"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PERLMAX/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PE/PERLMAX/GooCanvas2-0.06.tar.gz; sha256 = "0l1vsvyv9hjxhsxrahq4h64axh7qmk50kiz2spa3s1hr7s3qfk72"; }; buildInputs = [ pkgs.gtk3 ]; @@ -6655,10 +7160,11 @@ let }; }; - GoogleProtocolBuffers = buildPerlPackage rec { - name = "Google-ProtocolBuffers-0.12"; + GoogleProtocolBuffers = buildPerlPackage { + pname = "Google-ProtocolBuffers"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SAXJAZMAN/protobuf/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SA/SAXJAZMAN/protobuf/Google-ProtocolBuffers-0.12.tar.gz; sha256 = "0wad56n12h9yhnrq1m1z3jna1ch3mg3mqj41wkfi49ws1g34k15k"; }; propagatedBuildInputs = [ ClassAccessor ParseRecDescent ]; @@ -6670,18 +7176,20 @@ let }; }; - Graph = buildPerlPackage rec { - name = "Graph-0.9704"; + Graph = buildPerlPackage { + pname = "Graph"; + version = "0.9704"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHI/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JH/JHI/Graph-0.9704.tar.gz; sha256 = "099a1gca0wj5zs0cffncjqp2mjrdlk9i6325ks89ml72gfq8wpij"; }; }; - GraphViz = buildPerlPackage rec { - name = "GraphViz-2.24"; + GraphViz = buildPerlPackage { + pname = "GraphViz"; + version = "2.24"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSAVAGE/${name}.tgz"; + url = mirror://cpan/authors/id/R/RS/RSAVAGE/GraphViz-2.24.tgz; sha256 = "1bgm4a8kan53r30qiknr4kasvhar1khf7vq064l1inzfrp2glpnr"; }; @@ -6695,10 +7203,11 @@ let }; }; - grepmail = buildPerlPackage rec { - name = "grepmail-5.3111"; + grepmail = buildPerlPackage { + pname = "grepmail"; + version = "5.3111"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DC/DCOPPIT/grepmail-5.3111.tar.gz; sha256 = "d0984e3f7a1be17ae014575f70c1678151a5bcc9622185dc5a052cb63271a761"; }; buildInputs = [ FileHomeDir FileSlurper TestCompile UNIVERSALrequire URI ]; @@ -6712,8 +7221,9 @@ let }; }; - GrowlGNTP = buildPerlModule rec { - name = "Growl-GNTP-0.21"; + GrowlGNTP = buildPerlModule { + pname = "Growl-GNTP"; + version = "0.21"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MATTN/Growl-GNTP-0.21.tar.gz; sha256 = "0gq8ypam6ifp8f3s2mf5d6sw53m7h3ki1zfahh2p41kl8a77yy98"; @@ -6722,10 +7232,11 @@ let propagatedBuildInputs = [ CryptCBC DataUUID ]; }; - GSSAPI = buildPerlPackage rec { - name = "GSSAPI-0.28"; + GSSAPI = buildPerlPackage { + pname = "GSSAPI"; + version = "0.28"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AG/AGROLMS/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AG/AGROLMS/GSSAPI-0.28.tar.gz; sha256 = "1mkhwxjjlhr58pd770i9gnf7zy7jj092iv6jfbnb8bvnc5xjr3vx"; }; propagatedBuildInputs = [ pkgs.krb5Full.dev ]; @@ -6737,10 +7248,11 @@ let makeMakerFlags = "--gssapiimpl ${pkgs.krb5Full.dev}"; }; - Gtk2 = buildPerlPackage rec { - name = "Gtk2-1.24992"; + Gtk2 = buildPerlPackage { + pname = "Gtk2"; + version = "1.24992"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + url = mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.24992.tar.gz; sha256 = "1044rj3wbfmgaif2jb0k28m2aczli6ai2n5yvn6pr7zjyw16kvd2"; }; buildInputs = [ pkgs.gtk2 Cairo ExtUtilsDepends ExtUtilsPkgConfig Glib Pango ]; @@ -6752,10 +7264,11 @@ let }; }; - Gtk2GladeXML = buildPerlPackage rec { - name = "Gtk2-GladeXML-1.007"; + Gtk2GladeXML = buildPerlPackage { + pname = "Gtk2-GladeXML"; + version = "1.007"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TS/TSCH/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TS/TSCH/Gtk2-GladeXML-1.007.tar.gz; sha256 = "50240a2bddbda807c8f8070de941823b7bf3d288a13be6d0d6563320b42c445a"; }; propagatedBuildInputs = [ pkgs.gnome2.libglade pkgs.gtk2 Gtk2 Pango ]; @@ -6765,10 +7278,11 @@ let }; }; - Gtk2TrayIcon = buildPerlPackage rec { - name = "Gtk2-TrayIcon-0.06"; + Gtk2TrayIcon = buildPerlPackage { + pname = "Gtk2-TrayIcon"; + version = "0.06"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BORUP/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BO/BORUP/Gtk2-TrayIcon-0.06.tar.gz; sha256 = "cbb7632b75d7f41554dfe8ee9063dbfd1d8522291077c65d0d82e9ceb5e94ae2"; }; propagatedBuildInputs = [ pkgs.gtk2 Gtk2 Pango ]; @@ -6777,10 +7291,11 @@ let }; }; - Gtk2AppIndicator = buildPerlPackage rec { - name = "Gtk2-AppIndicator-0.15"; + Gtk2AppIndicator = buildPerlPackage { + pname = "Gtk2-AppIndicator"; + version = "0.15"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OE/OESTERHOL/${name}.tar.gz"; + url = mirror://cpan/authors/id/O/OE/OESTERHOL/Gtk2-AppIndicator-0.15.tar.gz; sha256 = "a25cb071e214fb89b4450aa4605031eae89b7961e149b0d6e8f491c19c14a90a"; }; propagatedBuildInputs = [ pkgs.libappindicator-gtk2 pkgs.libdbusmenu-gtk2 pkgs.gtk2 pkgs.pkgconfig Gtk2 ]; @@ -6793,10 +7308,11 @@ let }; }; - Gtk2ImageView = buildPerlPackage rec { - name = "Gtk2-ImageView-0.05"; + Gtk2ImageView = buildPerlPackage { + pname = "Gtk2-ImageView"; + version = "0.05"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RA/RATCLIFFE/Gtk2-ImageView-0.05.tar.gz; sha256 = "087186c3693acf196451cf59cc8b7f5cf9a7b05abe20d32dcbcba0822953fb80"; }; buildInputs = [ pkgs.gtkimageview pkgs.gtk2 ]; @@ -6811,10 +7327,11 @@ let }; }; - Gtk2Unique = buildPerlPackage rec { - name = "Gtk2-Unique-0.05"; + Gtk2Unique = buildPerlPackage { + pname = "Gtk2-Unique"; + version = "0.05"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PO/POTYL/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PO/POTYL/Gtk2-Unique-0.05.tar.gz; sha256 = "ae8dfb0f6844ddaa2ce7b5b44553419490c8e83c24fd35c431406a58f6be0f4f"; }; propagatedBuildInputs = [ pkgs.libunique pkgs.gtk2 Gtk2 Pango ]; @@ -6824,10 +7341,11 @@ let }; }; - Gtk3 = buildPerlPackage rec { - name = "Gtk3-0.034"; + Gtk3 = buildPerlPackage { + pname = "Gtk3"; + version = "0.034"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + url = mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.034.tar.gz; sha256 = "0baxyhlzdf7avka40h1niiir8vz4nilqkiwh876i0hv0f8xj3nqa"; }; propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ]; @@ -6837,10 +7355,11 @@ let }; }; - Gtk3SimpleList = buildPerlPackage rec { - name = "Gtk3-SimpleList-0.18"; + Gtk3SimpleList = buildPerlPackage { + pname = "Gtk3-SimpleList"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TV/TVIGNAUD/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TV/TVIGNAUD/Gtk3-SimpleList-0.18.tar.gz; sha256 = "09azmc7miyvw7q21rz8cxw16zbd5i1j5hpakxy376f5vmhqqjyhp"; }; meta = { @@ -6850,18 +7369,20 @@ let propagatedBuildInputs = [ Gtk3 ]; }; - Guard = buildPerlPackage rec { - name = "Guard-1.023"; + Guard = buildPerlPackage { + pname = "Guard"; + version = "1.023"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Guard-1.023.tar.gz; sha256 = "34c4ddf91fc93d1090d86da14df706d175b1610c67372c01e12ce9555d4dd1dc"; }; }; - HashDiff = buildPerlPackage rec { - name = "Hash-Diff-0.010"; + HashDiff = buildPerlPackage { + pname = "Hash-Diff"; + version = "0.010"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOLAV/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BO/BOLAV/Hash-Diff-0.010.tar.gz; sha256 = "1ig0l859gq00k0r9l85274r2lbvwl7wsndcy52c0m3y9isilm6mw"; }; propagatedBuildInputs = [ HashMerge ]; @@ -6873,8 +7394,8 @@ let buildInputs = [ TestSimple13 ]; }; - ham = buildPerlPackage rec { - name = "ham-unstable-${version}"; + ham = buildPerlPackage { + pname = "ham-unstable"; version = "2019-01-22"; src = fetchFromGitHub { @@ -6914,8 +7435,9 @@ let }; }; - HashFlatten = buildPerlPackage rec { - name = "Hash-Flatten-1.19"; + HashFlatten = buildPerlPackage { + pname = "Hash-Flatten"; + version = "1.19"; src = fetchurl { url = mirror://cpan/authors/id/B/BB/BBC/Hash-Flatten-1.19.tar.gz; sha256 = "162b9qgkr19f97w4pic6igyk3zd0sbnrhl3s8530fikciffw9ikh"; @@ -6924,10 +7446,11 @@ let propagatedBuildInputs = [ LogTrace ]; }; - HashMerge = buildPerlPackage rec { - name = "Hash-Merge-0.300"; + HashMerge = buildPerlPackage { + pname = "Hash-Merge"; + version = "0.300"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REHSACK/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RE/REHSACK/Hash-Merge-0.300.tar.gz; sha256 = "0h3wfnpv5d4d3f9xzmwkchay6251nhzngdv3f6xia56mj4hxabs0"; }; propagatedBuildInputs = [ CloneChoose ]; @@ -6938,7 +7461,8 @@ let }; HashMergeSimple = buildPerlPackage { - name = "Hash-Merge-Simple-0.051"; + pname = "Hash-Merge-Simple"; + version = "0.051"; src = fetchurl { url = mirror://cpan/authors/id/R/RO/ROKR/Hash-Merge-Simple-0.051.tar.gz; sha256 = "1c56327873d2f04d5722777f044863d968910466997740d55a754071c6287b73"; @@ -6951,10 +7475,11 @@ let }; }; - HashMoreUtils = buildPerlPackage rec { - name = "Hash-MoreUtils-0.06"; + HashMoreUtils = buildPerlPackage { + pname = "Hash-MoreUtils"; + version = "0.06"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REHSACK/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RE/REHSACK/Hash-MoreUtils-0.06.tar.gz; sha256 = "db9a8fb867d50753c380889a5e54075651b5e08c9b3b721cb7220c0883547de8"; }; meta = { @@ -6964,7 +7489,8 @@ let }; HashMultiValue = buildPerlPackage { - name = "Hash-MultiValue-0.16"; + pname = "Hash-MultiValue"; + version = "0.16"; src = fetchurl { url = mirror://cpan/authors/id/A/AR/ARISTOTLE/Hash-MultiValue-0.16.tar.gz; sha256 = "1x3k7h542xnigz0b8vsfiq580p5r325wi5b8mxppiqk8mbvis636"; @@ -6976,7 +7502,8 @@ let }; HashUtilFieldHashCompat = buildPerlPackage { - name = "Hash-Util-FieldHash-Compat-0.11"; + pname = "Hash-Util-FieldHash-Compat"; + version = "0.11"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Hash-Util-FieldHash-Compat-0.11.tar.gz; sha256 = "06vlygjyk7rkkw0di3252mma141w801qn3xk40aa2yskbfklcbk4"; @@ -6984,17 +7511,19 @@ let }; HeapFibonacci = buildPerlPackage { - name = "Heap-0.80"; + pname = "Heap"; + version = "0.80"; src = fetchurl { url = mirror://cpan/authors/id/J/JM/JMM/Heap-0.80.tar.gz; sha256 = "1plv2djbyhvkdcw2ic54rdqb745cwksxckgzvw7ssxiir7rjknnc"; }; }; - HookLexWrap = buildPerlPackage rec { - name = "Hook-LexWrap-0.26"; + HookLexWrap = buildPerlPackage { + pname = "Hook-LexWrap"; + version = "0.26"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/Hook-LexWrap-0.26.tar.gz; sha256 = "b60bdc5f98f94f9294b06adef82b1d996da192d5f183f9f434b610fd1137ec2d"; }; buildInputs = [ pkgs.unzip ]; @@ -7005,10 +7534,11 @@ let }; }; - HTMLClean = buildPerlPackage rec { - name = "HTML-Clean-0.8"; + HTMLClean = buildPerlPackage { + pname = "HTML-Clean"; + version = "0.8"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LI/LINDNER/${name}.tar.gz"; + url = mirror://cpan/authors/id/L/LI/LINDNER/HTML-Clean-0.8.tar.gz; sha256 = "1h0dzxx034hpshxlpsxhxh051d1p79cjgp4q5kg68kgx7aian85c"; }; meta = { @@ -7018,7 +7548,8 @@ let }; HTMLElementExtended = buildPerlPackage { - name = "HTML-Element-Extended-1.18"; + pname = "HTML-Element-Extended"; + version = "1.18"; src = fetchurl { url = mirror://cpan/authors/id/M/MS/MSISK/HTML-Element-Extended-1.18.tar.gz; sha256 = "f3ef1af108f27fef15ebec66479f251ce08aa49bd00b0462c9c80c86b4b6b32b"; @@ -7026,10 +7557,11 @@ let propagatedBuildInputs = [ HTMLTree ]; }; - HTMLEscape = buildPerlModule rec { - name = "HTML-Escape-1.10"; + HTMLEscape = buildPerlModule { + pname = "HTML-Escape"; + version = "1.10"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/HTML-Escape-1.10.tar.gz; sha256 = "b1cbac4157ad8dedac6914e1628855e05b8dc885a4007d2e4df8177c6a9b70fb"; }; buildInputs = [ ModuleBuildPluggablePPPort TestRequires ]; @@ -7041,7 +7573,8 @@ let }; HTMLFromANSI = buildPerlPackage { - name = "HTML-FromANSI-2.03"; + pname = "HTML-FromANSI"; + version = "2.03"; src = fetchurl { url = mirror://cpan/authors/id/N/NU/NUFFIN/HTML-FromANSI-2.03.tar.gz; sha256 = "21776345ed701b2c04c7b09380af943f9984cc7f99624087aea45db5fc09c359"; @@ -7052,7 +7585,8 @@ let }; HTMLForm = buildPerlPackage { - name = "HTML-Form-6.04"; + pname = "HTML-Form"; + version = "6.04"; src = fetchurl { url = mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.04.tar.gz; sha256 = "100090bdsr5kapv8h0wxzwlzfbfqn57rq9gzrvg9i6hvnsl5gmcw"; @@ -7065,7 +7599,8 @@ let }; HTMLFormatter = buildPerlPackage { - name = "HTML-Formatter-2.16"; + pname = "HTML-Formatter"; + version = "2.16"; src = fetchurl { url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-Formatter-2.16.tar.gz; sha256 = "cb0a0dd8aa5e8ba9ca214ce451bf4df33aa09c13e907e8d3082ddafeb30151cc"; @@ -7079,7 +7614,8 @@ let }; HTMLFormatTextWithLinks = buildPerlModule { - name = "HTML-FormatText-WithLinks-0.15"; + pname = "HTML-FormatText-WithLinks"; + version = "0.15"; src = fetchurl { url = mirror://cpan/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-0.15.tar.gz; sha256 = "7fcc1ab79eb58fb97d43e5bdd14e21791a250a204998918c62d6a171131833b1"; @@ -7092,7 +7628,8 @@ let }; HTMLFormatTextWithLinksAndTables = buildPerlPackage { - name = "HTML-FormatText-WithLinks-AndTables-0.07"; + pname = "HTML-FormatText-WithLinks-AndTables"; + version = "0.07"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-0.07.tar.gz; sha256 = "809ee2f11705706b33c54312b5c7bee674838f2beaaedaf8cb945e702aae39b6"; @@ -7104,8 +7641,9 @@ let }; }; - HTMLFormFu = buildPerlPackage rec { - name = "HTML-FormFu-2.07"; + HTMLFormFu = buildPerlPackage { + pname = "HTML-FormFu"; + version = "2.07"; src = fetchurl { url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-FormFu-2.07.tar.gz; sha256 = "0cpbcrip95rvihc7i8dywca6lx9ws67ch1hjx6vgnm47g9zh2bsg"; @@ -7118,8 +7656,9 @@ let }; }; - HTMLFormFuMultiForm = buildPerlPackage rec { - name = "HTML-FormFu-MultiForm-1.03"; + HTMLFormFuMultiForm = buildPerlPackage { + pname = "HTML-FormFu-MultiForm"; + version = "1.03"; src = fetchurl { url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-FormFu-MultiForm-1.03.tar.gz; sha256 = "17qm94hwhn6jyhd2am4gqxq7yrlhv3jv0ayx17df95mqdgbhrw1n"; @@ -7133,7 +7672,8 @@ let }; HTMLFormHandler = buildPerlPackage { - name = "HTML-FormHandler-0.40068"; + pname = "HTML-FormHandler"; + version = "0.40068"; src = fetchurl { url = mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40068.tar.gz; sha256 = "09z8rpb3avdd8984rm6j6gd2igbzjz9rc0ycig654mqjlgfphyzb"; @@ -7149,7 +7689,8 @@ let }; HTMLMason = buildPerlPackage { - name = "HTML-Mason-1.58"; + pname = "HTML-Mason"; + version = "1.58"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.58.tar.gz; sha256 = "81dc9b199f0f3b3473c97ba0ebee4b9535cd633d4e9c1ca3818615dc03dff948"; @@ -7163,7 +7704,8 @@ let }; HTMLMasonPSGIHandler = buildPerlPackage { - name = "HTML-Mason-PSGIHandler-0.53"; + pname = "HTML-Mason-PSGIHandler"; + version = "0.53"; src = fetchurl { url = mirror://cpan/authors/id/R/RU/RUZ/HTML-Mason-PSGIHandler-0.53.tar.gz; sha256 = "eafd7c7655dfa8261df3446b931a283d30306877b83ac4671c49cff74ea7f00b"; @@ -7176,10 +7718,11 @@ let }; }; - HTMLParser = buildPerlPackage rec { - name = "HTML-Parser-3.72"; + HTMLParser = buildPerlPackage { + pname = "HTML-Parser"; + version = "3.72"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.72.tar.gz; sha256 = "12v05ywlnsi9lc17z32k9jxx3sj1viy7y1wpl7n4az76v7hwfa7c"; }; propagatedBuildInputs = [ HTMLTagset ]; @@ -7189,10 +7732,11 @@ let }; }; - HTMLTagCloud = buildPerlModule rec { - name = "HTML-TagCloud-0.38"; + HTMLTagCloud = buildPerlModule { + pname = "HTML-TagCloud"; + version = "0.38"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROBERTSD/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RO/ROBERTSD/HTML-TagCloud-0.38.tar.gz; sha256 = "05bhnrwwlwd6cj3cn91zw5r99xddvy142bznid26p1pg5m3rk029"; }; meta = { @@ -7202,7 +7746,8 @@ let }; HTMLQuoted = buildPerlPackage { - name = "HTML-Quoted-0.04"; + pname = "HTML-Quoted"; + version = "0.04"; src = fetchurl { url = mirror://cpan/authors/id/T/TS/TSIBLEY/HTML-Quoted-0.04.tar.gz; sha256 = "8b41f313fdc1812f02f6f6c37d58f212c84fdcf7827f7fd4b030907f39dc650c"; @@ -7215,7 +7760,8 @@ let }; HTMLRewriteAttributes = buildPerlPackage { - name = "HTML-RewriteAttributes-0.05"; + pname = "HTML-RewriteAttributes"; + version = "0.05"; src = fetchurl { url = mirror://cpan/authors/id/T/TS/TSIBLEY/HTML-RewriteAttributes-0.05.tar.gz; sha256 = "1808ec7cdf40d2708575fe6155a88f103b17fec77973a5831c2f24c250e7a58c"; @@ -7228,7 +7774,8 @@ let }; HTMLSelectorXPath = buildPerlPackage { - name = "HTML-Selector-XPath-0.25"; + pname = "HTML-Selector-XPath"; + version = "0.25"; src = fetchurl { url = mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.25.tar.gz; sha256 = "1qbad8ayffpx7wj76ip05p6rh9p1lkir6qknpl76zy679ghlsp8s"; @@ -7236,8 +7783,9 @@ let buildInputs = [ TestBase ]; }; - HTMLScrubber = buildPerlPackage rec { - name = "HTML-Scrubber-0.17"; + HTMLScrubber = buildPerlPackage { + pname = "HTML-Scrubber"; + version = "0.17"; src = fetchurl { url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-Scrubber-0.17.tar.gz; sha256 = "06p7w4zd42b2yh541mlzyqj40lwmvvn3fyqi8big4mf34la7m2jm"; @@ -7246,25 +7794,28 @@ let buildInputs = [ PodCoverageTrustPod TestCPANMeta TestDifferences TestEOL TestKwalitee TestMemoryCycle TestNoTabs TestPAUSEPermissions TestPod TestPodCoverage ]; }; - HTMLTableExtract = buildPerlPackage rec { - name = "HTML-TableExtract-2.13"; + HTMLTableExtract = buildPerlPackage { + pname = "HTML-TableExtract"; + version = "2.13"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSISK/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MS/MSISK/HTML-TableExtract-2.13.tar.gz; sha256 = "01jimmss3q68a89696wmclvqwb2ybz6xgabpnbp6mm6jcni82z8a"; }; propagatedBuildInputs = [ HTMLElementExtended ]; }; - HTMLTagset = buildPerlPackage rec { - name = "HTML-Tagset-3.20"; + HTMLTagset = buildPerlPackage { + pname = "HTML-Tagset"; + version = "3.20"; src = fetchurl { url = mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz; sha256 = "1qh8249wgr4v9vgghq77zh1d2zs176bir223a8gh3k9nksn7vcdd"; }; }; - HTMLTemplate = buildPerlPackage rec { - name = "HTML-Template-2.97"; + HTMLTemplate = buildPerlPackage { + pname = "HTML-Template"; + version = "2.97"; src = fetchurl { url = mirror://cpan/authors/id/S/SA/SAMTREGAR/HTML-Template-2.97.tar.gz; sha256 = "17qjw8swj2q4b1ic285pndgrkmvpsqw0j68nhqzpk1daydhsyiv5"; @@ -7273,10 +7824,11 @@ let buildInputs = [ TestPod ]; }; - HTMLTidy = buildPerlPackage rec { - name = "HTML-Tidy-1.60"; + HTMLTidy = buildPerlPackage { + pname = "HTML-Tidy"; + version = "1.60"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tidy-1.60.tar.gz; sha256 = "1iyp2fd6j75cn1xvcwl2lxr8qpjxssy2360cyqn6g3kzd1fzdyxw"; }; @@ -7287,10 +7839,11 @@ let buildInputs = [ TestException ]; }; - HTMLTiny = buildPerlPackage rec { - name = "HTML-Tiny-1.05"; + HTMLTiny = buildPerlPackage { + pname = "HTML-Tiny"; + version = "1.05"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AN/ANDYA/HTML-Tiny-1.05.tar.gz; sha256 = "d7cdc9d5985e2e44ceba10b756acf1e0d3a1b3ee3b516e5b54adb850fe79fda3"; }; meta = { @@ -7299,17 +7852,19 @@ let }; }; - HTMLTokeParserSimple = buildPerlModule rec { - name = "HTML-TokeParser-Simple-3.16"; + HTMLTokeParserSimple = buildPerlModule { + pname = "HTML-TokeParser-Simple"; + version = "3.16"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz"; + url = mirror://cpan/authors/id/O/OV/OVID/HTML-TokeParser-Simple-3.16.tar.gz; sha256 = "17aa1v62sp8ycxcicwhankmj4brs6nnfclk9z7mf1rird1f164gd"; }; propagatedBuildInputs = [ HTMLParser SubOverride ]; }; HTMLTree = buildPerlModule { - name = "HTML-Tree-5.07"; + pname = "HTML-Tree"; + version = "5.07"; src = fetchurl { url = mirror://cpan/authors/id/K/KE/KENTNL/HTML-Tree-5.07.tar.gz; sha256 = "1gyvm4qlwm9y6hczkpnrdfl303ggbybr0nqxdjw09hii8yw4sdzh"; @@ -7323,7 +7878,8 @@ let }; HTMLTreeBuilderXPath = buildPerlPackage { - name = "HTML-TreeBuilder-XPath-0.14"; + pname = "HTML-TreeBuilder-XPath"; + version = "0.14"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIROD/HTML-TreeBuilder-XPath-0.14.tar.gz; sha256 = "1wx4i1scng20n405fp3a4vrwvvq9bvbmg977wnd5j2ja8jrbvsr5"; @@ -7336,7 +7892,8 @@ let }; HTMLWidget = buildPerlPackage { - name = "HTML-Widget-1.11"; + pname = "HTML-Widget"; + version = "1.11"; src = fetchurl { url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-Widget-1.11.tar.gz; sha256 = "02w21rd30cza094m5xs9clzw8ayigbhg2ddzl6jycp4jam0dyhmy"; @@ -7346,10 +7903,11 @@ let buildInputs = [ TestNoWarnings ]; }; - HTTPBody = buildPerlPackage rec { - name = "HTTP-Body-1.22"; + HTTPBody = buildPerlPackage { + pname = "HTTP-Body"; + version = "1.22"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GE/GETTY/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GE/GETTY/HTTP-Body-1.22.tar.gz; sha256 = "fc0d2c585b3bd1532d92609965d589e0c87cd380e7cca42fb9ad0a1311227297"; }; buildInputs = [ TestDeep ]; @@ -7361,7 +7919,8 @@ let }; HTTPCookies = buildPerlPackage { - name = "HTTP-Cookies-6.04"; + pname = "HTTP-Cookies"; + version = "6.04"; src = fetchurl { url = mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Cookies-6.04.tar.gz; sha256 = "1m0kxcirbvbkrm2c59p1bkbvzlcdymg8fdpa7wlxijlx0xwz1iqc"; @@ -7374,7 +7933,8 @@ let }; HTTPDaemon = buildPerlPackage { - name = "HTTP-Daemon-6.01"; + pname = "HTTP-Daemon"; + version = "6.01"; src = fetchurl { url = mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz; sha256 = "1hmd2isrkilf0q0nkxms1q64kikjmcw9imbvrjgky6kh89vqdza3"; @@ -7387,7 +7947,8 @@ let }; HTTPDate = buildPerlPackage { - name = "HTTP-Date-6.02"; + pname = "HTTP-Date"; + version = "6.02"; src = fetchurl { url = mirror://cpan/authors/id/G/GA/GAAS/HTTP-Date-6.02.tar.gz; sha256 = "0cz357kafhhzw7w59iyi0wvhw7rlh5g1lh38230ckw7rl0fr9fg8"; @@ -7398,8 +7959,9 @@ let }; }; - HTTPEntityParser = buildPerlModule rec { - name = "HTTP-Entity-Parser-0.21"; + HTTPEntityParser = buildPerlModule { + pname = "HTTP-Entity-Parser"; + version = "0.21"; src = fetchurl { url = mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.21.tar.gz; sha256 = "1n7qhyscllialds5jsk1k8x2vmfbjvisa3342as5x15hpm13wkf1"; @@ -7413,8 +7975,9 @@ let }; }; - HTTPDAV = buildPerlPackage rec { - name = "HTTP-DAV-0.49"; + HTTPDAV = buildPerlPackage { + pname = "HTTP-DAV"; + version = "0.49"; src = fetchurl { url = mirror://cpan/authors/id/C/CO/COSIMO/HTTP-DAV-0.49.tar.gz; sha256 = "0z4mgb8mc6l5nfsm3ihndjqgpk43q39x1kq9hryy6v8hxkwrscrk"; @@ -7425,18 +7988,20 @@ let propagatedBuildInputs = [ XMLDOM ]; }; - HTTPHeaderParserXS = buildPerlPackage rec { - name = "HTTP-HeaderParser-XS-0.20"; + HTTPHeaderParserXS = buildPerlPackage { + pname = "HTTP-HeaderParser-XS"; + version = "0.20"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKSMITH/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MARKSMITH/HTTP-HeaderParser-XS-0.20.tar.gz; sha256 = "1vs6sw431nnlnbdy6jii9vqlz30ndlfwdpdgm8a1m6fqngzhzq59"; }; }; - HTTPHeadersFast = buildPerlModule rec { - name = "HTTP-Headers-Fast-0.22"; + HTTPHeadersFast = buildPerlModule { + pname = "HTTP-Headers-Fast"; + version = "0.22"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/HTTP-Headers-Fast-0.22.tar.gz; sha256 = "cc431db68496dd884db4bc0c0b7112c1f4a4f1dc68c4f5a3caa757a1e7481b48"; }; buildInputs = [ ModuleBuildTiny TestRequires ]; @@ -7448,19 +8013,21 @@ let }; }; - HTTPLite = buildPerlPackage rec { - name = "HTTP-Lite-2.44"; + HTTPLite = buildPerlPackage { + pname = "HTTP-Lite"; + version = "2.44"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NE/NEILB/HTTP-Lite-2.44.tar.gz; sha256 = "0z77nflj8zdcfg70kc93glq5kmd6qxn2nf7h70x4xhfg25wkvr1q"; }; buildInputs = [ CGI ]; }; - HTTPMessage = buildPerlPackage rec { - name = "HTTP-Message-6.18"; + HTTPMessage = buildPerlPackage { + pname = "HTTP-Message"; + version = "6.18"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/${name}.tar.gz"; + url = mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.18.tar.gz; sha256 = "d060d170d388b694c58c14f4d13ed908a2807f0e581146cef45726641d809112"; }; buildInputs = [ TryTiny ]; @@ -7472,8 +8039,9 @@ let }; }; - HTTPMultiPartParser = buildPerlPackage rec { - name = "HTTP-MultiPartParser-0.02"; + HTTPMultiPartParser = buildPerlPackage { + pname = "HTTP-MultiPartParser"; + version = "0.02"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHANSEN/HTTP-MultiPartParser-0.02.tar.gz; sha256 = "04hbs0b1lzv2c8dqfcc9qjm5akh25fn40903is36zlalkwaxmpay"; @@ -7486,7 +8054,8 @@ let }; HTTPNegotiate = buildPerlPackage { - name = "HTTP-Negotiate-6.01"; + pname = "HTTP-Negotiate"; + version = "6.01"; src = fetchurl { url = mirror://cpan/authors/id/G/GA/GAAS/HTTP-Negotiate-6.01.tar.gz; sha256 = "05p053vjs5g91v5cmjnny7a3xzddz5k7vnjw81wfh01ilqg9qwhw"; @@ -7498,18 +8067,20 @@ let }; }; - HTTPParserXS = buildPerlPackage rec { - name = "HTTP-Parser-XS-0.17"; + HTTPParserXS = buildPerlPackage { + pname = "HTTP-Parser-XS"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KA/KAZUHO/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KA/KAZUHO/HTTP-Parser-XS-0.17.tar.gz; sha256 = "02d84xq1mm53c7jl33qyb7v5w4372vydp74z6qj0vc96wcrnhkkr"; }; }; - HTTPProxy = buildPerlPackage rec { - name = "HTTP-Proxy-0.304"; + HTTPProxy = buildPerlPackage { + pname = "HTTP-Proxy"; + version = "0.304"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOOK/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BO/BOOK/HTTP-Proxy-0.304.tar.gz; sha256 = "b05290534ec73625c21a0565fc35170890dab163843d95331c292c23f504c69d"; }; propagatedBuildInputs = [ LWP ]; @@ -7521,8 +8092,9 @@ let doCheck = false; }; - HTTPRequestAsCGI = buildPerlPackage rec { - name = "HTTP-Request-AsCGI-1.2"; + HTTPRequestAsCGI = buildPerlPackage { + pname = "HTTP-Request-AsCGI"; + version = "1.2"; src = fetchurl { url = mirror://cpan/authors/id/F/FL/FLORA/HTTP-Request-AsCGI-1.2.tar.gz; sha256 = "1smwmiarwcgq7vjdblnb6ldi2x1s5sk5p15p7xvm5byiqq3znnwl"; @@ -7531,7 +8103,8 @@ let }; HTTPResponseEncoding = buildPerlPackage { - name = "HTTP-Response-Encoding-0.06"; + pname = "HTTP-Response-Encoding"; + version = "0.06"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DANKOGAI/HTTP-Response-Encoding-0.06.tar.gz; sha256 = "1am8lis8107s5npca1xgazdy5sknknzcqyhdmc220s4a4f77n5hh"; @@ -7544,7 +8117,8 @@ let }; HTTPServerSimple = buildPerlPackage { - name = "HTTP-Server-Simple-0.52"; + pname = "HTTP-Server-Simple"; + version = "0.52"; src = fetchurl { url = mirror://cpan/authors/id/B/BP/BPS/HTTP-Server-Simple-0.52.tar.gz; sha256 = "0k6bg7k6mjixfzxdkkdrhqvaqmdhjszx0zsk8g0bimiby6j9z4yq"; @@ -7556,10 +8130,11 @@ let propagatedBuildInputs = [ CGI ]; }; - HTTPServerSimpleAuthen = buildPerlPackage rec { - name = "HTTP-Server-Simple-Authen-0.04"; + HTTPServerSimpleAuthen = buildPerlPackage { + pname = "HTTP-Server-Simple-Authen"; + version = "0.04"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Server-Simple-Authen-0.04.tar.gz; sha256 = "2dddc8ab9dc8986980151e4ba836a6bbf091f45cf195be1768ebdb4a993ed59b"; }; propagatedBuildInputs = [ AuthenSimple HTTPServerSimple ]; @@ -7569,7 +8144,8 @@ let }; HTTPServerSimpleMason = buildPerlPackage { - name = "HTTP-Server-Simple-Mason-0.14"; + pname = "HTTP-Server-Simple-Mason"; + version = "0.14"; src = fetchurl { url = mirror://cpan/authors/id/J/JE/JESSE/HTTP-Server-Simple-Mason-0.14.tar.gz; sha256 = "b7a49d8e6e55bff0b1f0278d951685466b143243b6f9e59e071f5472ca2a025a"; @@ -7581,8 +8157,9 @@ let }; }; - HTTPServerSimplePSGI = buildPerlPackage rec { - name = "HTTP-Server-Simple-PSGI-0.16"; + HTTPServerSimplePSGI = buildPerlPackage { + pname = "HTTP-Server-Simple-PSGI"; + version = "0.16"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Server-Simple-PSGI-0.16.tar.gz; sha256 = "1fhx2glycd66m4l4m1gja81ixq8nh4r5g9wjhhkrffq4af2cnz2z"; @@ -7595,10 +8172,11 @@ let }; }; - HTTPTinyish = buildPerlPackage rec { - name = "HTTP-Tinyish-0.15"; + HTTPTinyish = buildPerlPackage { + pname = "HTTP-Tinyish"; + version = "0.15"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Tinyish-0.15.tar.gz; sha256 = "5d65f0ee20a9e4744acdb3ef12edae78c121f53dcbc9cf00867c5725c4513aa5"; }; propagatedBuildInputs = [ FileWhich IPCRun3 ]; @@ -7609,10 +8187,11 @@ let }; }; - iCalParser = buildPerlPackage rec { - name = "iCal-Parser-1.21"; + iCalParser = buildPerlPackage { + pname = "iCal-Parser"; + version = "1.21"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RI/RIXED/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RI/RIXED/iCal-Parser-1.21.tar.gz; sha256 = "0d7939a644a8e67017ec7239d3d9604f3986bb9a4ff80be68fe7299ebfd2270c"; }; propagatedBuildInputs = [ DateTimeFormatICal FreezeThaw IOString TextvFileasData ]; @@ -7621,10 +8200,11 @@ let }; }; - Imager = buildPerlPackage rec { - name = "Imager-1.011"; + Imager = buildPerlPackage { + pname = "Imager"; + version = "1.011"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TONYC/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TO/TONYC/Imager-1.011.tar.gz; sha256 = "a3aea2f0c172c2c094baeced4a3bdaa9f54e3e85c97eea2e5f8f994ba2beedfc"; }; buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ]; @@ -7636,10 +8216,11 @@ let }; }; - ImageInfo = buildPerlPackage rec { - name = "Image-Info-1.41"; + ImageInfo = buildPerlPackage { + pname = "Image-Info"; + version = "1.41"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SREZIC/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SR/SREZIC/Image-Info-1.41.tar.gz; sha256 = "c546d27414686660dbc3cd8501537128c5285a8db0faf742c2dc12b9a29ba3db"; }; propagatedBuildInputs = [ IOStringy ]; @@ -7649,10 +8230,11 @@ let }; }; - ImageSane = buildPerlPackage rec { - name = "Image-Sane-0.14"; + ImageSane = buildPerlPackage { + pname = "Image-Sane"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RA/RATCLIFFE/Image-Sane-0.14.tar.gz; sha256 = "a4b027c9b7650291f1acb0eb93861a7fc45aef4e08f6726843f174fa113c8ba5"; }; buildInputs = [ pkgs.sane-backends ExtUtilsDepends ExtUtilsPkgConfig TestRequires TryTiny ]; @@ -7663,10 +8245,11 @@ let }; }; - ImageScale = buildPerlPackage rec { - name = "Image-Scale-0.14"; + ImageScale = buildPerlPackage { + pname = "Image-Scale"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AG/AGRUNDMA/Image-Scale-0.14.tar.gz; sha256 = "f09c5f0663b87738365ac2819e186b909abeb9ed85d83bc15ee76872c947cdf8"; }; buildInputs = [ pkgs.libpng pkgs.libjpeg TestNoWarnings ]; @@ -7678,10 +8261,11 @@ let }; }; - ImageSize = buildPerlPackage rec { - name = "Image-Size-3.300"; + ImageSize = buildPerlPackage { + pname = "Image-Size"; + version = "3.300"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJRAY/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJRAY/Image-Size-3.300.tar.gz; sha256 = "0sq2kwdph55h4adx50fmy86brjkkv8grsw33xrhf1k9icpwb3jak"; }; buildInputs = [ ModuleBuild ]; @@ -7692,7 +8276,8 @@ let }; IMAPClient = buildPerlPackage { - name = "IMAP-Client-0.13"; + pname = "IMAP-Client"; + version = "0.13"; src = fetchurl { url = mirror://cpan/authors/id/C/CO/CONTEB/IMAP-Client-0.13.tar.gz; sha256 = "15fa4hpw2rqg2iadyz10rnv99hns78wph5qlh3257a3mbfjjyyla"; @@ -7700,10 +8285,11 @@ let doCheck = false; # nondeterministic }; - Importer = buildPerlPackage rec { - name = "Importer-0.025"; + Importer = buildPerlPackage { + pname = "Importer"; + version = "0.025"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Importer-0.025.tar.gz; sha256 = "0745138c487d74033d0cbeb36f06595036dc7e688f1a5dbec9cc2fa799e13946"; }; meta = { @@ -7713,7 +8299,8 @@ let }; ImportInto = buildPerlPackage { - name = "Import-Into-1.002005"; + pname = "Import-Into"; + version = "1.002005"; src = fetchurl { url = mirror://cpan/authors/id/H/HA/HAARG/Import-Into-1.002005.tar.gz; sha256 = "0rq5kz7c270q33jq6hnrv3xgkvajsc62ilqq7fs40av6zfipg7mx"; @@ -7726,7 +8313,8 @@ let }; IO = buildPerlPackage { - name = "IO-1.39"; + pname = "IO"; + version = "1.39"; src = fetchurl { url = mirror://cpan/authors/id/T/TO/TODDR/IO-1.39.tar.gz; sha256 = "4f0502e7f123ac824188eb8873038aaf2ddcc29f8babc1a0b2e1cd34b55a1fca"; @@ -7739,7 +8327,8 @@ let }; IOAll = buildPerlPackage { - name = "IO-All-0.87"; + pname = "IO-All"; + version = "0.87"; src = fetchurl { url = mirror://cpan/authors/id/F/FR/FREW/IO-All-0.87.tar.gz; sha256 = "0nsd9knlbd7if2v6zwj4q978axq0w5hk8ymp61z14a821hjivqjl"; @@ -7751,10 +8340,11 @@ let }; }; - IOCapture = buildPerlPackage rec { - name = "IO-Capture-0.05"; + IOCapture = buildPerlPackage { + pname = "IO-Capture"; + version = "0.05"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REYNOLDS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RE/REYNOLDS/IO-Capture-0.05.tar.gz; sha256 = "c2c15a254ca74fb8c57d25d7b6cbcaff77a3b4fb5695423f1f80bb423abffea9"; }; meta = { @@ -7762,10 +8352,11 @@ let }; }; - IOCaptureOutput = buildPerlPackage rec { - name = "IO-CaptureOutput-1.1104"; + IOCaptureOutput = buildPerlPackage { + pname = "IO-CaptureOutput"; + version = "1.1104"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/IO-CaptureOutput-1.1104.tar.gz; sha256 = "fcc732fcb438f97a72b30e8c7796484bef2562e374553b207028e2fbf73f8330"; }; meta = { @@ -7775,10 +8366,11 @@ let }; }; - IOCompress = buildPerlPackage rec { - name = "IO-Compress-2.086"; + IOCompress = buildPerlPackage { + pname = "IO-Compress"; + version = "2.086"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.086.tar.gz; sha256 = "110a229aa02b701f9820f5e0c2e9c30db342ea241b2d01c03703ea4922b1ab53"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; @@ -7791,7 +8383,8 @@ let }; IODigest = buildPerlPackage { - name = "IO-Digest-0.11"; + pname = "IO-Digest"; + version = "0.11"; src = fetchurl { url = mirror://cpan/authors/id/C/CL/CLKAO/IO-Digest-0.11.tar.gz; sha256 = "14kz7z4xw179aya3116wxac29l4y2wmwrba087lya4v2gxdgiz4g"; @@ -7800,7 +8393,8 @@ let }; IOHTML = buildPerlPackage { - name = "IO-HTML-1.001"; + pname = "IO-HTML"; + version = "1.001"; src = fetchurl { url = mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-1.001.tar.gz; sha256 = "ea78d2d743794adc028bc9589538eb867174b4e165d7d8b5f63486e6b828e7e0"; @@ -7811,8 +8405,9 @@ let }; }; - IOHandleUtil = buildPerlModule rec { - name = "IO-Handle-Util-0.02"; + IOHandleUtil = buildPerlModule { + pname = "IO-Handle-Util"; + version = "0.02"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/IO-Handle-Util-0.02.tar.gz; sha256 = "1vncvsx53iiw1yy3drlk44hzx2pk5cial0h74djf9i6s2flndfcd"; @@ -7824,7 +8419,8 @@ let }; IOInteractive = buildPerlPackage { - name = "IO-Interactive-1.022"; + pname = "IO-Interactive"; + version = "1.022"; src = fetchurl { url = mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-1.022.tar.gz; sha256 = "0ed53b8ae93ae877e98e0d89b7b429e29ccd1ee4c28e952c4ea9aa73d01febdc"; @@ -7835,8 +8431,9 @@ let }; }; - IOLockedFile = buildPerlPackage rec { - name = "IO-LockedFile-0.23"; + IOLockedFile = buildPerlPackage { + pname = "IO-LockedFile"; + version = "0.23"; src = fetchurl { url = mirror://cpan/authors/id/R/RA/RANI/IO-LockedFile-0.23.tar.gz; sha256 = "1dgq8zfkaszisdb5hz8jgcl0xc3qpv7bbv562l31xgpiddm7xnxi"; @@ -7844,25 +8441,27 @@ let }; IOMultiplex = buildPerlPackage { - name = "IO-Multiplex-1.16"; + pname = "IO-Multiplex"; + version = "1.16"; src = fetchurl { url = mirror://cpan/authors/id/B/BB/BBB/IO-Multiplex-1.16.tar.gz; sha256 = "74d22c44b5ad2e7190e2786e8a17d74bbf4cef89b4d1157ba33598b5a2720dad"; }; }; - IOPager = buildPerlPackage rec { + IOPager = buildPerlPackage { version = "0.40"; - name = "IO-Pager-${version}"; + pname = "IO-Pager"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-${version}.tgz"; + url = mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-0.40.tgz; sha256 = "1vzdypsr7vkj8nnda9ccrksci6pqj5awwmi89l7x3mbpq36gad87"; }; propagatedBuildInputs = [ pkgs.more FileWhich ]; # `more` used in tests }; IOPrompt = buildPerlModule { - name = "IO-Prompt-0.997004"; + pname = "IO-Prompt"; + version = "0.997004"; src = fetchurl { url = mirror://cpan/authors/id/D/DC/DCONWAY/IO-Prompt-0.997004.tar.gz; sha256 = "f17bb305ee6ac8b5b203e6d826eb940c4f3f6d6f4bfe719c3b3a225f46f58615"; @@ -7875,7 +8474,8 @@ let }; IOSessionData = buildPerlPackage { - name = "IO-SessionData-1.03"; + pname = "IO-SessionData"; + version = "1.03"; src = fetchurl { url = mirror://cpan/authors/id/P/PH/PHRED/IO-SessionData-1.03.tar.gz; sha256 = "1p9d77pqy9a8dbgw7h7vmmkg0rlckk19dchd4c8gvcyv7qm73934"; @@ -7886,20 +8486,22 @@ let }; }; - IOSocketInet6 = buildPerlModule rec { - name = "IO-Socket-INET6-2.72"; + IOSocketInet6 = buildPerlModule { + pname = "IO-Socket-INET6"; + version = "2.72"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.72.tar.gz; sha256 = "1fqypz6qa5rw2d5y2zq7f49frwra0aln13nhq5gi514j2zx21q45"; }; propagatedBuildInputs = [ Socket6 ]; doCheck = false; }; - IOSocketSSL = buildPerlPackage rec { - name = "IO-Socket-SSL-2.066"; + IOSocketSSL = buildPerlPackage { + pname = "IO-Socket-SSL"; + version = "2.066"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.066.tar.gz; sha256 = "0d47064781a545304d5dcea5dfcee3acc2e95a32e1b4884d80505cde8ee6ebcd"; }; propagatedBuildInputs = [ MozillaCA NetSSLeay ]; @@ -7916,10 +8518,11 @@ let doCheck = false; # tries to connect to facebook.com etc. }; - IOSocketTimeout = buildPerlModule rec { - name = "IO-Socket-Timeout-0.32"; + IOSocketTimeout = buildPerlModule { + pname = "IO-Socket-Timeout"; + version = "0.32"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAMS/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DA/DAMS/IO-Socket-Timeout-0.32.tar.gz; sha256 = "edf915d6cc66bee43503aa6dc2b373366f38eaff701582183dad10cb8adf2972"; }; buildInputs = [ ModuleBuildTiny TestSharedFork TestTCP ]; @@ -7930,24 +8533,27 @@ let }; }; - IOString = buildPerlPackage rec { - name = "IO-String-1.08"; + IOString = buildPerlPackage { + pname = "IO-String"; + version = "1.08"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GA/GAAS/IO-String-1.08.tar.gz; sha256 = "2a3f4ad8442d9070780e58ef43722d19d1ee21a803bf7c8206877a10482de5a0"; }; }; - IOStringy = buildPerlPackage rec { - name = "IO-stringy-2.111"; + IOStringy = buildPerlPackage { + pname = "IO-stringy"; + version = "2.111"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DS/DSKOLL/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DS/DSKOLL/IO-stringy-2.111.tar.gz; sha256 = "178rpx0ym5l2m9mdmpnr92ziscvchm541w94fd7ygi6311kgsrwc"; }; }; - IOTee = buildPerlPackage rec { - name = "IO-Tee-0.65"; + IOTee = buildPerlPackage { + pname = "IO-Tee"; + version = "0.65"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEILB/IO-Tee-0.65.tar.gz; sha256 = "04hc94fk6qlazrarcznw2d8wiqw289js4za0czw65296kc8csgf6"; @@ -7955,7 +8561,8 @@ let }; IOTieCombine = buildPerlPackage { - name = "IO-TieCombine-1.005"; + pname = "IO-TieCombine"; + version = "1.005"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/IO-TieCombine-1.005.tar.gz; sha256 = "1bv9ampayf4bvyxg4ivy18l8k79jvq55x6gl68b2fg8b62w4sba0"; @@ -7967,19 +8574,21 @@ let }; }; - IOTty = buildPerlPackage rec { - name = "IO-Tty-1.12"; + IOTty = buildPerlPackage { + pname = "IO-Tty"; + version = "1.12"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.12.tar.gz; sha256 = "0399anjy3bc0w8xzsc3qx5vcyqryc9gc52lc7wh7i49hsdq8gvx2"; }; doCheck = !stdenv.isDarwin; # openpty fails in the sandbox }; - IPCountry = buildPerlPackage rec { - name = "IP-Country-2.28"; + IPCountry = buildPerlPackage { + pname = "IP-Country"; + version = "2.28"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NW/NWETTERS/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NW/NWETTERS/IP-Country-2.28.tar.gz; sha256 = "88db833a5ab22ed06cb53d6f205725e3b5371b254596053738885e91fa105f75"; }; propagatedBuildInputs = [ GeographyCountries ]; @@ -7989,10 +8598,11 @@ let }; }; - GeographyCountries = buildPerlPackage rec { - name = "Geography-Countries-2009041301"; + GeographyCountries = buildPerlPackage { + pname = "Geography-Countries"; + version = "2009041301"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AB/ABIGAIL/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AB/ABIGAIL/Geography-Countries-2009041301.tar.gz; sha256 = "48c42e40e8281ba7c981743a854c48e6def2d51eb0925ea6c96e25c74497f20f"; }; meta = { @@ -8003,7 +8613,8 @@ let IPCRun = buildPerlPackage { - name = "IPC-Run-20180523.0"; + pname = "IPC-Run"; + version = "20180523.0"; src = fetchurl { url = mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20180523.0.tar.gz; sha256 = "0bvckcs1629ifqfb68xkapd4a74fd5qbg6z9qs8i6rx4z3nxfl1q"; @@ -8017,16 +8628,18 @@ let buildInputs = [ Readonly ]; }; - IPCRun3 = buildPerlPackage rec { - name = "IPC-Run3-0.048"; + IPCRun3 = buildPerlPackage { + pname = "IPC-Run3"; + version = "0.048"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/IPC-Run3-0.048.tar.gz; sha256 = "0r9m8q78bg7yycpixd7738jm40yz71p2q7inm766kzsw3g6c709x"; }; }; - IPCShareLite = buildPerlPackage rec { - name = "IPC-ShareLite-0.17"; + IPCShareLite = buildPerlPackage { + pname = "IPC-ShareLite"; + version = "0.17"; src = fetchurl { url = mirror://cpan/authors/id/A/AN/ANDYA/IPC-ShareLite-0.17.tar.gz; sha256 = "1gz7dbwxrzbzdsjv11kb49jlf9q6lci2va6is0hnavd93nwhdm0l"; @@ -8034,7 +8647,8 @@ let }; IPCSystemSimple = buildPerlPackage { - name = "IPC-System-Simple-1.25"; + pname = "IPC-System-Simple"; + version = "1.25"; src = fetchurl { url = mirror://cpan/authors/id/P/PJ/PJF/IPC-System-Simple-1.25.tar.gz; sha256 = "f1b6aa1dfab886e8e4ea825f46a1cbb26038ef3e727fef5d84444aa8035a4d3b"; @@ -8046,7 +8660,8 @@ let }; IPCSysV = buildPerlPackage { - name = "IPC-SysV-2.07"; + pname = "IPC-SysV"; + version = "2.07"; src = fetchurl { url = mirror://cpan/authors/id/M/MH/MHX/IPC-SysV-2.07.tar.gz; sha256 = "d01a367af771d35e3b11a21366ad6405f8d28e8cbca4c0cf08ab78bf157d052d"; @@ -8057,12 +8672,12 @@ let }; }; - ImageExifTool = buildPerlPackage rec { - name = "Image-ExifTool-${version}"; + ImageExifTool = buildPerlPackage { + pname = "Image-ExifTool"; version = "11.50"; src = fetchurl { - url = "https://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz"; + url = "https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.50.tar.gz"; sha256 = "0d8v48y94z8maxkmw1rv7v9m0jg2dc8xbp581njb6yhr7abwqdv3"; }; @@ -8088,8 +8703,9 @@ let }; }; - Inline = buildPerlPackage rec { - name = "Inline-0.82"; + Inline = buildPerlPackage { + pname = "Inline"; + version = "0.82"; src = fetchurl { url = mirror://cpan/authors/id/T/TI/TINITA/Inline-0.82.tar.gz; sha256 = "1af94a8e95e4ba4545592341c47d8d1dc45b01822b877f7d3095a438566e874b"; @@ -8108,10 +8724,11 @@ let }; }; - InlineC = buildPerlPackage rec { - name = "Inline-C-0.80"; + InlineC = buildPerlPackage { + pname = "Inline-C"; + version = "0.80"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TINITA/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TI/TINITA/Inline-C-0.80.tar.gz; sha256 = "35f5ff188f56b9c8a5ec342e2ff3a2d248ddbc91eead80d9361697914d5adbe3"; }; buildInputs = [ FileCopyRecursive FileShareDirInstall TestWarn YAMLLibYAML ]; @@ -8128,8 +8745,9 @@ let }; }; - InlineJava = buildPerlPackage rec { - name = "Inline-Java-0.66"; + InlineJava = buildPerlPackage { + pname = "Inline-Java"; + version = "0.66"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETJ/Inline-Java-0.66.tar.gz; @@ -8158,16 +8776,18 @@ let }; }; - IPCSignal = buildPerlPackage rec { - name = "IPC-Signal-1.00"; + IPCSignal = buildPerlPackage { + pname = "IPC-Signal"; + version = "1.00"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROSCH/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RO/ROSCH/IPC-Signal-1.00.tar.gz; sha256 = "1l3g0zrcwf2whwjhbpwdcridb7c77mydwxvfykqg1h6hqb4gj8bw"; }; }; - JavaScriptMinifierXS = buildPerlModule rec { - name = "JavaScript-Minifier-XS-0.11"; + JavaScriptMinifierXS = buildPerlModule { + pname = "JavaScript-Minifier-XS"; + version = "0.11"; src = fetchurl { url = mirror://cpan/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.11.tar.gz; sha256 = "1vlyhckpjbrg2v4dy9szsxxl0q44n0y1xl763mg2y2ym9g5144hm"; @@ -8178,8 +8798,9 @@ let }; }; - JavaScriptValueEscape = buildPerlModule rec { - name = "JavaScript-Value-Escape-0.07"; + JavaScriptValueEscape = buildPerlModule { + pname = "JavaScript-Value-Escape"; + version = "0.07"; src = fetchurl { url = mirror://cpan/authors/id/K/KA/KAZEBURO/JavaScript-Value-Escape-0.07.tar.gz; sha256 = "1p5365lvnax8kbcfrj169lx05af3i3qi5wg5x9mizqgd10vxmjws"; @@ -8192,7 +8813,8 @@ let }; JSON = buildPerlPackage { - name = "JSON-4.02"; + pname = "JSON"; + version = "4.02"; src = fetchurl { url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.02.tar.gz; sha256 = "0z32x2lijij28c9fhmzgxc41i9nw24fyvd2a8ajs5zw9b9sqhjj4"; @@ -8209,7 +8831,8 @@ let }; JSONAny = buildPerlPackage { - name = "JSON-Any-1.39"; + pname = "JSON-Any"; + version = "1.39"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/JSON-Any-1.39.tar.gz; sha256 = "1hspg6khjb38syn59cysnapc1q77qgavfym3fqr6l2kiydf7ajdf"; @@ -8221,8 +8844,9 @@ let buildInputs = [ TestFatal TestRequires TestWarnings TestWithoutModule ]; }; - JSONMaybeXS = buildPerlPackage rec { - name = "JSON-MaybeXS-1.004000"; + JSONMaybeXS = buildPerlPackage { + pname = "JSON-MaybeXS"; + version = "1.004000"; src = fetchurl { url = mirror://cpan/authors/id/H/HA/HAARG/JSON-MaybeXS-1.004000.tar.gz; sha256 = "09m1w03as6n0a00pzvaldkhm494yaf5n0g3j2cwwfx24iwpa1gar"; @@ -8233,8 +8857,9 @@ let }; }; - JSONPP = buildPerlPackage rec { - name = "JSON-PP-4.02"; + JSONPP = buildPerlPackage { + pname = "JSON-PP"; + version = "4.02"; src = fetchurl { url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.02.tar.gz; sha256 = "11wlh4clq0cddiamh1ipps3fh9ly01j4pcdh8f4nw7912bw7pimc"; @@ -8246,7 +8871,8 @@ let }; JSONPPCompat5006 = buildPerlPackage { - name = "JSON-PP-Compat5006-1.09"; + pname = "JSON-PP-Compat5006"; + version = "1.09"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-Compat5006-1.09.tar.gz; sha256 = "197030df52635f9bbe25af10742eea5bd74971473118c11311fcabcb62e3716a"; @@ -8257,10 +8883,11 @@ let }; }; - JSONWebToken = buildPerlModule rec { - name = "JSON-WebToken-0.10"; + JSONWebToken = buildPerlModule { + pname = "JSON-WebToken"; + version = "0.10"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAICRON/${name}.tar.gz"; + url = mirror://cpan/authors/id/X/XA/XAICRON/JSON-WebToken-0.10.tar.gz; sha256 = "77c182a98528f1714d82afc548d5b3b4dc93e67069128bb9b9413f24cf07248b"; }; buildInputs = [ TestMockGuard TestRequires ]; @@ -8273,7 +8900,8 @@ let }; JSONXS = buildPerlPackage { - name = "JSON-XS-4.02"; + pname = "JSON-XS"; + version = "4.02"; src = fetchurl { url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.02.tar.gz; sha256 = "05ngmpc0smlfzgyhyagd5gza8g93r8hik858kmr186h770higbd5"; @@ -8282,10 +8910,11 @@ let buildInputs = [ CanaryStability ]; }; - JSONXSVersionOneAndTwo = buildPerlPackage rec { - name = "JSON-XS-VersionOneAndTwo-0.31"; + JSONXSVersionOneAndTwo = buildPerlPackage { + pname = "JSON-XS-VersionOneAndTwo"; + version = "0.31"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LB/LBROCARD/${name}.tar.gz"; + url = mirror://cpan/authors/id/L/LB/LBROCARD/JSON-XS-VersionOneAndTwo-0.31.tar.gz; sha256 = "e6092c4d961fae777acf7fe99fb3cd6e5b710fec85765a6b90417480e4c94a34"; }; propagatedBuildInputs = [ JSONXS ]; @@ -8294,17 +8923,18 @@ let }; }; - Later = buildPerlPackage rec { + Later = buildPerlPackage { version = "0.21"; - name = "Object-Realize-Later-${version}"; + pname = "Object-Realize-Later"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MARKOV/Object-Realize-Later-0.21.tar.gz; sha256 = "1nfqssld7pcdw9sj4mkfnh75w51wl14i1h7npj9fld4fri09cywg"; }; }; libapreq2 = buildPerlPackage { - name = "libapreq2-2.13"; + pname = "libapreq2"; + version = "2.13"; src = fetchurl { url = mirror://cpan/authors/id/I/IS/ISAAC/libapreq2-2.13.tar.gz; sha256 = "5731e6833b32d88e4a5c690e45ddf20fcf969ce3da666c5627d775e92da0cf6e"; @@ -8352,8 +8982,9 @@ let }; }; - libintl_perl = buildPerlPackage rec { - name = "libintl-perl-1.31"; + libintl_perl = buildPerlPackage { + pname = "libintl-perl"; + version = "1.31"; src = fetchurl { url = mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.31.tar.gz; sha256 = "1afandrl44mq9c32r57xr489gkfswdgc97h8x86k98dz1byv3l6a"; @@ -8361,7 +8992,8 @@ let }; libnet = buildPerlPackage { - name = "libnet-3.11"; + pname = "libnet"; + version = "3.11"; src = fetchurl { url = mirror://cpan/authors/id/S/SH/SHAY/libnet-3.11.tar.gz; sha256 = "1lsj3a2vbryh85mbb6yddyb2zjv5vs88fdj5x3v7fp2ndr6ixarg"; @@ -8372,8 +9004,9 @@ let }; }; - librelative = buildPerlPackage rec { - name = "lib-relative-1.000"; + librelative = buildPerlPackage { + pname = "lib-relative"; + version = "1.000"; src = fetchurl { url = mirror://cpan/authors/id/D/DB/DBOOK/lib-relative-1.000.tar.gz; sha256 = "1mvcdl87d3kyrdx4y6x79k3n5qdd1x5m1hp8lwjxvgfqbw0cgq6z"; @@ -8385,17 +9018,19 @@ let }; }; - libxml_perl = buildPerlPackage rec { - name = "libxml-perl-0.08"; + libxml_perl = buildPerlPackage { + pname = "libxml-perl"; + version = "0.08"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KM/KMACLEOD/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KM/KMACLEOD/libxml-perl-0.08.tar.gz; sha256 = "1jy9af0ljyzj7wakqli0437zb2vrbplqj4xhab7bfj2xgfdhawa5"; }; propagatedBuildInputs = [ XMLParser ]; }; LinguaENFindNumber = buildPerlPackage { - name = "Lingua-EN-FindNumber-1.32"; + pname = "Lingua-EN-FindNumber"; + version = "1.32"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-FindNumber-1.32.tar.gz; sha256 = "1d176d1c863fb9844bd19d2c2a4e68a0ed73da158f724a89405b90db7e8dbd04"; @@ -8408,10 +9043,11 @@ let }; }; - LinguaENInflect = buildPerlPackage rec { - name = "Lingua-EN-Inflect-1.903"; + LinguaENInflect = buildPerlPackage { + pname = "Lingua-EN-Inflect"; + version = "1.903"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCONWAY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.903.tar.gz; sha256 = "fcef4b67b04cc39e427b2d70e7c5b24195edd0ed88dd705a08ecd5cd830b0d49"; }; meta = { @@ -8420,10 +9056,11 @@ let }; }; - LinguaENInflectNumber = buildPerlPackage rec { - name = "Lingua-EN-Inflect-Number-1.12"; + LinguaENInflectNumber = buildPerlPackage { + pname = "Lingua-EN-Inflect-Number"; + version = "1.12"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-Inflect-Number-1.12.tar.gz; sha256 = "66fb33838512746f5c597e80264fea66643f7f26570ec2f9205b6135ad67acbf"; }; propagatedBuildInputs = [ LinguaENInflect ]; @@ -8434,10 +9071,11 @@ let }; }; - LinguaENInflectPhrase = buildPerlPackage rec { - name = "Lingua-EN-Inflect-Phrase-0.20"; + LinguaENInflectPhrase = buildPerlPackage { + pname = "Lingua-EN-Inflect-Phrase"; + version = "0.20"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RK/RKITOVER/Lingua-EN-Inflect-Phrase-0.20.tar.gz; sha256 = "55058911a99f1755de3eb449a99ffbeb92d88c01ff5dc60511a24679050ddea8"; }; buildInputs = [ TestNoWarnings ]; @@ -8449,7 +9087,8 @@ let }; LinguaENNumberIsOrdinal = buildPerlPackage { - name = "Lingua-EN-Number-IsOrdinal-0.05"; + pname = "Lingua-EN-Number-IsOrdinal"; + version = "0.05"; src = fetchurl { url = mirror://cpan/authors/id/R/RK/RKITOVER/Lingua-EN-Number-IsOrdinal-0.05.tar.gz; sha256 = "28d5695400c0f4e2bd209793cb74f6da2b9257356aacb2947c603425e09618d6"; @@ -8463,7 +9102,8 @@ let }; LinguaENTagger = buildPerlPackage { - name = "Lingua-EN-Tagger-0.30"; + pname = "Lingua-EN-Tagger"; + version = "0.30"; src = fetchurl { url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.30.tar.gz; sha256 = "0nrnkvsf9f0a7lp82sanmy89ms2nqq1lvjqicvsagsvzp513bl5b"; @@ -8476,7 +9116,8 @@ let }; LinguaENWords2Nums = buildPerlPackage { - name = "Lingua-EN-Words2Nums-0.18"; + pname = "Lingua-EN-Words2Nums"; + version = "0.18"; src = fetchurl { url = mirror://cpan/authors/id/J/JO/JOEY/Lingua-EN-Words2Nums-0.18.tar.gz; sha256 = "686556797cd2a4eaa066f19bbf03ab25c06278292c9ead2f187dfd9031ea1d85"; @@ -8486,8 +9127,9 @@ let }; }; - LinguaPTStemmer = buildPerlPackage rec { - name = "Lingua-PT-Stemmer-0.02"; + LinguaPTStemmer = buildPerlPackage { + pname = "Lingua-PT-Stemmer"; + version = "0.02"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-PT-Stemmer-0.02.tar.gz; sha256 = "17c48sfbgwd2ivlgf59sr6jdhwa3aim8750f8pyzz7xpi8gz0var"; @@ -8499,8 +9141,9 @@ let }; }; - LinguaStem = buildPerlModule rec { - name = "Lingua-Stem-0.84"; + LinguaStem = buildPerlModule { + pname = "Lingua-Stem"; + version = "0.84"; src = fetchurl { url = mirror://cpan/authors/id/S/SN/SNOWHARE/Lingua-Stem-0.84.tar.gz; sha256 = "12avh2mnnc7llmmshrr5bgb473fvydxnlqrqbl2815mf2dp4pxcg"; @@ -8509,8 +9152,9 @@ let propagatedBuildInputs = [ LinguaPTStemmer LinguaStemFr LinguaStemIt LinguaStemRu LinguaStemSnowballDa SnowballNorwegian SnowballSwedish TextGerman ]; }; - LinguaStemFr = buildPerlPackage rec { - name = "Lingua-Stem-Fr-0.02"; + LinguaStemFr = buildPerlPackage { + pname = "Lingua-Stem-Fr"; + version = "0.02"; src = fetchurl { url = mirror://cpan/authors/id/S/SD/SDP/Lingua-Stem-Fr-0.02.tar.gz; sha256 = "0vyrspwzaqjxm5mqshf4wvwa3938mkajd1918d9ii2l9m2rn8kwx"; @@ -8519,8 +9163,9 @@ let }; }; - LinguaStemIt = buildPerlPackage rec { - name = "Lingua-Stem-It-0.02"; + LinguaStemIt = buildPerlPackage { + pname = "Lingua-Stem-It"; + version = "0.02"; src = fetchurl { url = mirror://cpan/authors/id/A/AC/ACALPINI/Lingua-Stem-It-0.02.tar.gz; sha256 = "1207r183s5hlh4mfwa6p46vzm0dhvrs2dnss5s41a0gyfkxp7riq"; @@ -8529,8 +9174,9 @@ let }; }; - LinguaStemRu = buildPerlPackage rec { - name = "Lingua-Stem-Ru-0.04"; + LinguaStemRu = buildPerlPackage { + pname = "Lingua-Stem-Ru"; + version = "0.04"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-Stem-Ru-0.04.tar.gz; sha256 = "0a2jmdz7jn32qj5hyiw5kbv8fvlpmws8i00a6xcbkzb48yvwww0j"; @@ -8542,8 +9188,9 @@ let }; }; - LinguaStemSnowballDa = buildPerlPackage rec { - name = "Lingua-Stem-Snowball-Da-1.01"; + LinguaStemSnowballDa = buildPerlPackage { + pname = "Lingua-Stem-Snowball-Da"; + version = "1.01"; src = fetchurl { url = mirror://cpan/authors/id/C/CI/CINE/Lingua-Stem-Snowball-Da-1.01.tar.gz; sha256 = "0mm0m7glm1s6i9f6a78jslw6wh573208arxhq93yriqmw17bwf9f"; @@ -8552,19 +9199,21 @@ let }; }; - LinguaTranslit = buildPerlPackage rec { - name = "Lingua-Translit-0.28"; + LinguaTranslit = buildPerlPackage { + pname = "Lingua-Translit"; + version = "0.28"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AL/ALINKE/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AL/ALINKE/Lingua-Translit-0.28.tar.gz; sha256 = "113f91d8fc2c630437153a49fb7a52b023af8f6278ed96c070b1f60824b8eae1"; }; doCheck = false; }; - LinuxACL = buildPerlPackage rec { - name = "Linux-ACL-0.05"; + LinuxACL = buildPerlPackage { + pname = "Linux-ACL"; + version = "0.05"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NA/NAZAROV/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NA/NAZAROV/Linux-ACL-0.05.tar.gz; sha256 = "312940c1f60f47c4fc93fa0a9d2a626425faa837040c8c2f1ad58ee09f62f371"; }; buildInputs = [ pkgs.acl ]; @@ -8576,10 +9225,11 @@ let }; }; - LinuxDesktopFiles = buildPerlModule rec { - name = "Linux-DesktopFiles-0.25"; + LinuxDesktopFiles = buildPerlModule { + pname = "Linux-DesktopFiles"; + version = "0.25"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TR/TRIZEN/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TR/TRIZEN/Linux-DesktopFiles-0.25.tar.gz; sha256 = "60377a74fba90fa465200ee1c7430dbdde69d454d85f9ee101c039803a07e5f5"; }; meta = { @@ -8590,7 +9240,8 @@ let }; LinuxDistribution = buildPerlModule { - name = "Linux-Distribution-0.23"; + pname = "Linux-Distribution"; + version = "0.23"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHORNY/Linux-Distribution-0.23.tar.gz; sha256 = "603e27da607b3e872a669d7a66d75982f0969153eab2d4b20c341347b4ebda5f"; @@ -8604,10 +9255,11 @@ let }; }; - LinuxFD = buildPerlModule rec { - name = "Linux-FD-0.011"; + LinuxFD = buildPerlModule { + pname = "Linux-FD"; + version = "0.011"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; + url = mirror://cpan/authors/id/L/LE/LEONT/Linux-FD-0.011.tar.gz; sha256 = "6bb579d47644cb0ed35626ff77e909ae69063073c6ac09aa0614fef00fa37356"; }; buildInputs = [ TestException ]; @@ -8618,8 +9270,9 @@ let }; }; - LinuxInotify2 = buildPerlPackage rec { - name = "Linux-Inotify2-2.1"; + LinuxInotify2 = buildPerlPackage { + pname = "Linux-Inotify2"; + version = "2.1"; src = fetchurl { url = mirror://cpan/authors/id/M/ML/MLEHMANN/Linux-Inotify2-2.1.tar.gz; sha256 = "0w7jyq5pjy28s0ck34gy1vfbr069lhcn579bz0fh29h071sbcrbj"; @@ -8628,7 +9281,8 @@ let }; ListAllUtils = buildPerlPackage { - name = "List-AllUtils-0.15"; + pname = "List-AllUtils"; + version = "0.15"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.15.tar.gz; sha256 = "3711fac729321d3aad8356a756fd9272094f227aa048866a3751f9d8ea6cc95d"; @@ -8641,17 +9295,19 @@ let }; ListBinarySearch = buildPerlPackage { - name = "List-BinarySearch-0.25"; + pname = "List-BinarySearch"; + version = "0.25"; src = pkgs.fetchurl { url = mirror://cpan/authors/id/D/DA/DAVIDO/List-BinarySearch-0.25.tar.gz; sha256 = "0ap8y9rsjxg75887klgij90mf459f8dwy0dbx1g06h30pmqk04f8"; }; }; - ListCompare = buildPerlPackage rec { - name = "List-Compare-0.53"; + ListCompare = buildPerlPackage { + pname = "List-Compare"; + version = "0.53"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JK/JKEENAN/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JK/JKEENAN/List-Compare-0.53.tar.gz; sha256 = "fdbf4ff67b3135d44475fef7fcac0cd4706407d5720d26dca914860eb10f8550"; }; buildInputs = [ IOCaptureOutput ]; @@ -8662,10 +9318,11 @@ let }; }; - ListMoreUtils = buildPerlPackage rec { - name = "List-MoreUtils-0.428"; + ListMoreUtils = buildPerlPackage { + pname = "List-MoreUtils"; + version = "0.428"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REHSACK/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-0.428.tar.gz; sha256 = "713e0945d5f16e62d81d5f3da2b6a7b14a4ce439f6d3a7de74df1fd166476cc2"; }; propagatedBuildInputs = [ ExporterTiny ListMoreUtilsXS ]; @@ -8676,8 +9333,9 @@ let buildInputs = [ TestLeakTrace ]; }; - ListMoreUtilsXS = buildPerlPackage rec { - name = "List-MoreUtils-XS-0.428"; + ListMoreUtilsXS = buildPerlPackage { + pname = "List-MoreUtils-XS"; + version = "0.428"; src = fetchurl { url = mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.428.tar.gz; sha256 = "0bfndmnkqaaf3gffprak143bzplxd69c368jxgr7rzlx88hyd7wx"; @@ -8691,10 +9349,11 @@ let }; }; - ListSomeUtils = buildPerlPackage rec { - name = "List-SomeUtils-0.56"; + ListSomeUtils = buildPerlPackage { + pname = "List-SomeUtils"; + version = "0.56"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/List-SomeUtils-0.56.tar.gz; sha256 = "eaa7d99ce86380c0389876474c8eb84acc0a6bfeef1b0fc23a292592de6f89f7"; }; buildInputs = [ TestLeakTrace ]; @@ -8705,8 +9364,9 @@ let }; }; - ListUtilsBy = buildPerlModule rec { - name = "List-UtilsBy-0.11"; + ListUtilsBy = buildPerlModule { + pname = "List-UtilsBy"; + version = "0.11"; src = fetchurl { url = mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.11.tar.gz; sha256 = "0nkpylkqccxanr8wc7j9wg6jdrizybjjd6p8q3jbh7f29cxz9pgs"; @@ -8714,7 +9374,8 @@ let }; LocaleCodes = buildPerlPackage { - name = "Locale-Codes-3.60"; + pname = "Locale-Codes"; + version = "3.60"; src = fetchurl { url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.60.tar.gz; sha256 = "32829bc49d927335de6994f3cfd55c5e693881602564c2aa966fe86740371194"; @@ -8726,7 +9387,8 @@ let }; LocaleGettext = buildPerlPackage { - name = "gettext-1.07"; + pname = "gettext"; + version = "1.07"; buildInputs = [ pkgs.gettext ]; src = fetchurl { url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.07.tar.gz; @@ -8735,8 +9397,9 @@ let LANG="C"; }; - LocaleMOFile = buildPerlPackage rec { - name = "Locale-MO-File-0.09"; + LocaleMOFile = buildPerlPackage { + pname = "Locale-MO-File"; + version = "0.09"; src = fetchurl { url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-MO-File-0.09.tar.gz; sha256 = "0gsaaqimsh5bdhns2v67j1nvb178hx2536lxmr971cwxy31ns0wp"; @@ -8750,7 +9413,8 @@ let }; LocaleMaketextFuzzy = buildPerlPackage { - name = "Locale-Maketext-Fuzzy-0.11"; + pname = "Locale-Maketext-Fuzzy"; + version = "0.11"; src = fetchurl { url = mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Fuzzy-0.11.tar.gz; sha256 = "3785171ceb78cc7671319a3a6d8ced9b190e097dfcd9b2a9ebc804cd1a282f96"; @@ -8762,7 +9426,8 @@ let }; LocaleMaketextLexicon = buildPerlPackage { - name = "Locale-Maketext-Lexicon-1.00"; + pname = "Locale-Maketext-Lexicon"; + version = "1.00"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DRTECH/Locale-Maketext-Lexicon-1.00.tar.gz; sha256 = "b73f6b04a58d3f0e38ebf2115a4c1532f1a4eef6fac5c6a2a449e4e14c1ddc7c"; @@ -8774,7 +9439,8 @@ let }; LocaleMsgfmt = buildPerlPackage { - name = "Locale-Msgfmt-0.15"; + pname = "Locale-Msgfmt"; + version = "0.15"; src = fetchurl { url = mirror://cpan/authors/id/A/AZ/AZAWAWI/Locale-Msgfmt-0.15.tar.gz; sha256 = "c3276831cbeecf58be02081bcc180bd348daa35da21a7737b7b038a59f643ab4"; @@ -8786,7 +9452,8 @@ let }; LocalePO = buildPerlPackage { - name = "Locale-PO-0.27"; + pname = "Locale-PO"; + version = "0.27"; src = fetchurl { url = mirror://cpan/authors/id/C/CO/COSIMO/Locale-PO-0.27.tar.gz; sha256 = "3c994a4b63e6e4e836c6f79a93f51921cab77c90c9753fe0f8b5429220d516b9"; @@ -8797,8 +9464,9 @@ let }; }; - LocaleTextDomainOO = buildPerlPackage rec { - name = "Locale-TextDomain-OO-1.036"; + LocaleTextDomainOO = buildPerlPackage { + pname = "Locale-TextDomain-OO"; + version = "1.036"; src = fetchurl { url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-1.036.tar.gz; sha256 = "0f0fajq4k1sgyywsb7qypsf6xa1sxjx4agm8l8z2284nm3hq65xm"; @@ -8811,8 +9479,9 @@ let }; }; - LocaleTextDomainOOUtil = buildPerlPackage rec { - name = "Locale-TextDomain-OO-Util-4.002"; + LocaleTextDomainOOUtil = buildPerlPackage { + pname = "Locale-TextDomain-OO-Util"; + version = "4.002"; src = fetchurl { url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-Util-4.002.tar.gz; sha256 = "1826pl11vr9p7zv7vqs7kcd8y5218086l90dw8lw0xzdcmzs0prw"; @@ -8825,8 +9494,9 @@ let }; }; - LocaleUtilsPlaceholderBabelFish = buildPerlPackage rec { - name = "Locale-Utils-PlaceholderBabelFish-0.006"; + LocaleUtilsPlaceholderBabelFish = buildPerlPackage { + pname = "Locale-Utils-PlaceholderBabelFish"; + version = "0.006"; src = fetchurl { url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderBabelFish-0.006.tar.gz; sha256 = "1k54njj8xz19c8bjb0iln1mnfq55j3pvbff7samyrab3k59h071f"; @@ -8839,8 +9509,9 @@ let }; }; - LocaleUtilsPlaceholderMaketext = buildPerlPackage rec { - name = "Locale-Utils-PlaceholderMaketext-1.005"; + LocaleUtilsPlaceholderMaketext = buildPerlPackage { + pname = "Locale-Utils-PlaceholderMaketext"; + version = "1.005"; src = fetchurl { url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderMaketext-1.005.tar.gz; sha256 = "1srlbp8sfnzhndgh9s4d8bglpzw0vb8gnab9r8r8sggkv15n0a2h"; @@ -8853,8 +9524,9 @@ let }; }; - LocaleUtilsPlaceholderNamed = buildPerlPackage rec { - name = "Locale-Utils-PlaceholderNamed-1.004"; + LocaleUtilsPlaceholderNamed = buildPerlPackage { + pname = "Locale-Utils-PlaceholderNamed"; + version = "1.004"; src = fetchurl { url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderNamed-1.004.tar.gz; sha256 = "1gd68lm5w5c6ndcilx91rn84zviqyrk3fx92jjx5khxm76i8xmvg"; @@ -8867,10 +9539,11 @@ let }; }; - locallib = buildPerlPackage rec { - name = "local-lib-2.000024"; + locallib = buildPerlPackage { + pname = "local-lib"; + version = "2.000024"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; + url = mirror://cpan/authors/id/H/HA/HAARG/local-lib-2.000024.tar.gz; sha256 = "01cav7m6qc1x96wna1viiw6n212f94ks7cik4vj1a1lasixr36rf"; }; meta = { @@ -8880,18 +9553,20 @@ let propagatedBuildInputs = [ ModuleBuild ]; }; - LockFileSimple = buildPerlPackage rec { - name = "LockFile-Simple-0.208"; + LockFileSimple = buildPerlPackage { + pname = "LockFile-Simple"; + version = "0.208"; src = fetchurl { url = "mirror://cpan/authors/id/S/SC/SCHWIGON/lockfile-simple/LockFile-Simple-0.208.tar.gz"; sha256 = "18pk5a030dsg1h6wd8c47wl8pzrpyh9zi9h2c9gs9855nab7iis5"; }; }; - LogAny = buildPerlPackage rec { - name = "Log-Any-1.707"; + LogAny = buildPerlPackage { + pname = "Log-Any"; + version = "1.707"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PR/PREACTION/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-1.707.tar.gz; sha256 = "74510f8cbee12637462e7c6020c8943d447a1e8e149a256f8168ee47562c65f1"; }; # Syslog test fails. @@ -8903,10 +9578,11 @@ let }; }; - LogContextual = buildPerlPackage rec { - name = "Log-Contextual-0.008001"; + LogContextual = buildPerlPackage { + pname = "Log-Contextual"; + version = "0.008001"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FR/FREW/Log-Contextual-0.008001.tar.gz; sha256 = "b93cbcfbb8796d51c836e3b00243cda5630808c152c14eee5f20ca09c9451993"; }; buildInputs = [ TestFatal ]; @@ -8919,7 +9595,8 @@ let }; LogDispatch = buildPerlPackage { - name = "Log-Dispatch-2.68"; + pname = "Log-Dispatch"; + version = "2.68"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.68.tar.gz; sha256 = "1bxd3bhrn1h2q9f8r65z3101a32nl2kdb7l40bxg4vbsk4wk0ynh"; @@ -8932,10 +9609,11 @@ let buildInputs = [ IPCRun3 TestFatal TestNeeds ]; }; - LogHandler = buildPerlModule rec { - name = "Log-Handler-0.88"; + LogHandler = buildPerlModule { + pname = "Log-Handler"; + version = "0.88"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BL/BLOONIX/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BL/BLOONIX/Log-Handler-0.88.tar.gz; sha256 = "45bf540ab2138ed3ff93afc205b0516dc75755b86acdcc5e75c41347833c293d"; }; propagatedBuildInputs = [ ParamsValidate ]; @@ -8946,7 +9624,8 @@ let }; LogMessage = buildPerlPackage { - name = "Log-Message-0.08"; + pname = "Log-Message"; + version = "0.08"; src = fetchurl { url = mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-0.08.tar.gz; sha256 = "bd697dd62aaf26d118e9f0a0813429deb1c544e4501559879b61fcbdfe99fe46"; @@ -8957,8 +9636,9 @@ let }; }; - LogMessageSimple = buildPerlPackage rec { - name = "Log-Message-Simple-0.10"; + LogMessageSimple = buildPerlPackage { + pname = "Log-Message-Simple"; + version = "0.10"; src = fetchurl { url = mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-Simple-0.10.tar.gz; sha256 = "15nxi935nfrf8dkdrgvcrf2qlai4pbz03yj8sja0n9mcq2jd24ma"; @@ -8970,16 +9650,18 @@ let }; }; - LogTrace = buildPerlPackage rec { - name = "Log-Trace-1.070"; + LogTrace = buildPerlPackage { + pname = "Log-Trace"; + version = "1.070"; src = fetchurl { url = mirror://cpan/authors/id/B/BB/BBC/Log-Trace-1.070.tar.gz; sha256 = "1qrnxn9b05cqyw1286djllnj8wzys10754glxx6z5hihxxc85jwy"; }; }; - MCE = buildPerlPackage rec { - name = "MCE-1.838"; + MCE = buildPerlPackage { + pname = "MCE"; + version = "1.838"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.838.tar.gz; sha256 = "1xg63kd2la5zh7cvapv1l1wsxjallj4xv5l15bdp8jl3vvffwdhi"; @@ -8991,10 +9673,11 @@ let }; }; - LogLog4perl = buildPerlPackage rec { - name = "Log-Log4perl-1.49"; + LogLog4perl = buildPerlPackage { + pname = "Log-Log4perl"; + version = "1.49"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHILLI/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MS/MSCHILLI/Log-Log4perl-1.49.tar.gz; sha256 = "b739187f519146cb6bebcfc427c64b1f4138b35c5f4c96f46a21ed4a43872e16"; }; meta = { @@ -9005,7 +9688,8 @@ let }; LogDispatchArray = buildPerlPackage { - name = "Log-Dispatch-Array-1.003"; + pname = "Log-Dispatch-Array"; + version = "1.003"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatch-Array-1.003.tar.gz; sha256 = "0dvzp0gsh17jqg02460ndchyapr1haahndq1p9v6mwkv5wf9680c"; @@ -9019,10 +9703,11 @@ let }; }; - LogDispatchouli = buildPerlPackage rec { - name = "Log-Dispatchouli-2.017"; + LogDispatchouli = buildPerlPackage { + pname = "Log-Dispatchouli"; + version = "2.017"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.017.tar.gz; sha256 = "99f8341c8d4f8f46a673b1ff1a6edc96165d75af96ddcb6d99fa227f9af4dfbf"; }; buildInputs = [ TestDeep TestFatal ]; @@ -9034,10 +9719,11 @@ let }; }; - LogLogLite = buildPerlPackage rec { - name = "Log-LogLite-0.82"; + LogLogLite = buildPerlPackage { + pname = "Log-LogLite"; + version = "0.82"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RA/RANI/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RA/RANI/Log-LogLite-0.82.tar.gz; sha256 = "0sqsa4750wvhw4cjmxpxqg30i1jjcddadccflisrdb23qn5zn285"; }; propagatedBuildInputs = [ IOLockedFile ]; @@ -9047,8 +9733,9 @@ let }; }; - LWP = buildPerlPackage rec { - name = "libwww-perl-6.38"; + LWP = buildPerlPackage { + pname = "libwww-perl"; + version = "6.38"; src = fetchurl { url = mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.38.tar.gz; sha256 = "a8e0849b8d2798fc45a2a5f2fe45c96cbbad5baf3bcbe64a3bf85f210e78708c"; @@ -9066,10 +9753,11 @@ let buildInputs = [ TestFatal TestNeeds TestRequiresInternet ]; }; - LWPAuthenOAuth = buildPerlPackage rec { - name = "LWP-Authen-OAuth-1.02"; + LWPAuthenOAuth = buildPerlPackage { + pname = "LWP-Authen-OAuth"; + version = "1.02"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TIMBRODY/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TI/TIMBRODY/LWP-Authen-OAuth-1.02.tar.gz; sha256 = "e78e0bd7de8002cfb4760073258d555ef55b2c27c07a94b3d8a2166a17fd96bc"; }; propagatedBuildInputs = [ LWP ]; @@ -9080,7 +9768,8 @@ let }; LWPMediaTypes = buildPerlPackage { - name = "LWP-MediaTypes-6.04"; + pname = "LWP-MediaTypes"; + version = "6.04"; src = fetchurl { url = mirror://cpan/authors/id/O/OA/OALDERS/LWP-MediaTypes-6.04.tar.gz; sha256 = "1n8rg6csv3dsvymg06cmxipimr6cb1g9r903ghm1qsmiv89cl6wg"; @@ -9093,7 +9782,8 @@ let }; LWPProtocolConnect = buildPerlPackage { - name = "LWP-Protocol-connect-6.09"; + pname = "LWP-Protocol-connect"; + version = "6.09"; src = fetchurl { url = mirror://cpan/authors/id/B/BE/BENNING/LWP-Protocol-connect-6.09.tar.gz; sha256 = "9f252394775e23aa42c3176611e5930638ab528d5190110b4731aa5b0bf35a15"; @@ -9106,8 +9796,9 @@ let }; }; - LWPProtocolHttps = buildPerlPackage rec { - name = "LWP-Protocol-https-6.07"; + LWPProtocolHttps = buildPerlPackage { + pname = "LWP-Protocol-https"; + version = "6.07"; src = fetchurl { url = mirror://cpan/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.07.tar.gz; sha256 = "1rxrpwylfw1afah0nk96kgkwjbl2p1a7lwx50iipg8c4rx3cjb2j"; @@ -9122,8 +9813,9 @@ let buildInputs = [ TestRequiresInternet ]; }; - LWPProtocolhttp10 = buildPerlPackage rec { - name = "LWP-Protocol-http10-6.03"; + LWPProtocolhttp10 = buildPerlPackage { + pname = "LWP-Protocol-http10"; + version = "6.03"; src = fetchurl { url = mirror://cpan/authors/id/G/GA/GAAS/LWP-Protocol-http10-6.03.tar.gz; sha256 = "1lxq40qfwfai9ryhzhsdnycc4189c8kfl43rf7qq34fmz48skzzk"; @@ -9136,7 +9828,8 @@ let }; LWPUserAgentDetermined = buildPerlPackage { - name = "LWP-UserAgent-Determined-1.07"; + pname = "LWP-UserAgent-Determined"; + version = "1.07"; src = fetchurl { url = mirror://cpan/authors/id/A/AL/ALEXMV/LWP-UserAgent-Determined-1.07.tar.gz; sha256 = "06d8d50e8cd3692a11cb4fb44a2f84e5476a98f0e2e6a4a0dfce9f67e55ddb53"; @@ -9148,7 +9841,8 @@ let }; LWPUserAgentMockable = buildPerlModule { - name = "LWP-UserAgent-Mockable-1.18"; + pname = "LWP-UserAgent-Mockable"; + version = "1.18"; src = fetchurl { url = mirror://cpan/authors/id/M/MJ/MJEMMESON/LWP-UserAgent-Mockable-1.18.tar.gz; sha256 = "0923ahl22c0gdzrihj7dqnrawia9hmcl462asf4ry8d5wd84z1i5"; @@ -9161,10 +9855,11 @@ let buildInputs = [ ModuleBuildTiny TestRequiresInternet ]; }; - LWPxParanoidAgent = buildPerlPackage rec { - name = "LWPx-ParanoidAgent-1.12"; + LWPxParanoidAgent = buildPerlPackage { + pname = "LWPx-ParanoidAgent"; + version = "1.12"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SAXJAZMAN/lwp/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SA/SAXJAZMAN/lwp/LWPx-ParanoidAgent-1.12.tar.gz; sha256 = "0gfhw3jbs25yya2dryv8xvyn9myngcfcmsybj7gkq62fnznil16c"; }; doCheck = false; # 3 tests fail, probably because they try to connect to the network @@ -9173,10 +9868,11 @@ let maatkit = callPackage ../development/perl-modules/maatkit { }; - MacPasteboard = buildPerlPackage rec { - name = "Mac-Pasteboard-0.009"; + MacPasteboard = buildPerlPackage { + pname = "Mac-Pasteboard"; + version = "0.009"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz"; + url = "mirror://cpan/authors/id/W/WY/WYANT/Mac-Pasteboard-0.009.tar.gz"; sha256 = "85b1d5e9630973b997c3c1634e2df964d6a8d6cb57d9abe1f7093385cf26cf54"; }; meta = with stdenv.lib; { @@ -9188,7 +9884,8 @@ let }; MailAuthenticationResults = buildPerlPackage { - name = "Mail-AuthenticationResults-1.20180923"; + pname = "Mail-AuthenticationResults"; + version = "1.20180923"; src = fetchurl { url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-1.20180923.tar.gz; sha256 = "1g1wym9vcbhldwvi4w5pl0fhd4jh2icj975awf4wr5xmkli9mxbz"; @@ -9200,20 +9897,20 @@ let }; }; - MailMaildir = buildPerlPackage rec { + MailMaildir = buildPerlPackage { version = "1.0.0"; - name = "Mail-Maildir-${version}"; + pname = "Mail-Maildir"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZE/ZEROALTI/Mail-Maildir-100/${name}.tar.bz2"; + url = mirror://cpan/authors/id/Z/ZE/ZEROALTI/Mail-Maildir-100/Mail-Maildir-1.0.0.tar.bz2; sha256 = "1krkqfps6q3ifrhi9450l5gm9199qyfcm6vidllr0dv65kdaqpj4"; }; }; - MailBox = buildPerlPackage rec { + MailBox = buildPerlPackage { version = "3.006"; - name = "Mail-Box-${version}"; + pname = "Mail-Box"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.006.tar.gz; sha256 = "1fm17z13jq7ff2f4ynnajdzzdqa4sb0kx5nfy9fvb0nzw49qd502"; }; @@ -9222,10 +9919,11 @@ let propagatedBuildInputs = [ DevelGlobalDestruction FileRemove Later MailTransport ]; }; - MailMboxMessageParser = buildPerlPackage rec { - name = "Mail-Mbox-MessageParser-1.5111"; + MailMboxMessageParser = buildPerlPackage { + pname = "Mail-Mbox-MessageParser"; + version = "1.5111"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DC/DCOPPIT/Mail-Mbox-MessageParser-1.5111.tar.gz; sha256 = "5723c0aa9cc10bab9ed1e3bfd9d5c95f7159e71c1a475414eb1af1dee3a46237"; }; buildInputs = [ FileSlurper TestCompile TestPod TestPodCoverage TextDiff UNIVERSALrequire URI ]; @@ -9238,8 +9936,9 @@ let }; }; - MailMessage = buildPerlPackage rec { - name = "Mail-Message-3.008"; + MailMessage = buildPerlPackage { + pname = "Mail-Message"; + version = "3.008"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.008.tar.gz; sha256 = "1k3d996r2aqqzbv0xx5y88blpy9rp14lhd9vzjc1hjnrl7gij63f"; @@ -9251,8 +9950,9 @@ let }; }; - MailDKIM = buildPerlPackage rec { - name = "Mail-DKIM-0.55"; + MailDKIM = buildPerlPackage { + pname = "Mail-DKIM"; + version = "0.55"; src = fetchurl { url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.55.tar.gz; sha256 = "18nsh1ff6fkns4xk3y2ixmzmadgggydj11qkzj6nlnq2hzqxsafz"; @@ -9263,7 +9963,8 @@ let }; MailIMAPClient = buildPerlPackage { - name = "Mail-IMAPClient-3.42"; + pname = "Mail-IMAPClient"; + version = "3.42"; src = fetchurl { url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.42.tar.gz; sha256 = "0znf035ikaxyfishv507qq6g691xvbnziqlcwfikkj2l1kan88hw"; @@ -9271,10 +9972,11 @@ let propagatedBuildInputs = [ ParseRecDescent ]; }; - MailPOP3Client = buildPerlPackage rec { - name = "Mail-POP3Client-2.19"; + MailPOP3Client = buildPerlPackage { + pname = "Mail-POP3Client"; + version = "2.19"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SD/SDOWD/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SD/SDOWD/Mail-POP3Client-2.19.tar.gz; sha256 = "1142d6247a93cb86b23ed8835553bb2d227ff8213ee2743e4155bb93f47acb59"; }; meta = { @@ -9284,17 +9986,19 @@ let }; MailRFC822Address = buildPerlPackage { - name = "Mail-RFC822-Address-0.3"; + pname = "Mail-RFC822-Address"; + version = "0.3"; src = fetchurl { url = mirror://cpan/authors/id/P/PD/PDWARREN/Mail-RFC822-Address-0.3.tar.gz; sha256 = "351ef4104ecb675ecae69008243fae8243d1a7e53c681eeb759e7b781684c8a7"; }; }; - MailSender = buildPerlPackage rec { - name = "Mail-Sender-0.903"; + MailSender = buildPerlPackage { + pname = "Mail-Sender"; + version = "0.903"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/Mail-Sender-0.903.tar.gz; sha256 = "4413eb49f520a8318151811ccb05a8d542973aada20aa503ad32f9ffc98a39bf"; }; meta = { @@ -9304,8 +10008,9 @@ let }; }; - MailSendmail = buildPerlPackage rec { - name = "Mail-Sendmail-0.80"; + MailSendmail = buildPerlPackage { + pname = "Mail-Sendmail"; + version = "0.80"; src = fetchurl { url = "mirror://cpan/authors/id/N/NE/NEILB/Mail-Sendmail-0.80.tar.gz"; sha256 = "1r38qbkj7jwj8cqy1rnqzkk81psxi08b1aiq392817f3bk5ri2jv"; @@ -9324,11 +10029,11 @@ let }; }; - MailSPF = buildPerlPackage rec { - name = "Mail-SPF-v2.9.0"; - #src = /root/nixops/Mail-SPF-v2.9.0; + MailSPF = buildPerlPackage { + pname = "Mail-SPF"; + version = "2.9.0"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JM/JMEHNLE/mail-spf/${name}.tar.gz"; + url = "mirror://cpan/authors/id/J/JM/JMEHNLE/mail-spf/Mail-SPF-v2.9.0.tar.gz"; sha256 = "61cb5915f1c7acc7a931ffc1bfc1291bdfac555e2a46eb2391b995ea9ecb6162"; }; # remove this patch patches = [ ../development/perl-modules/Mail-SPF.patch ]; @@ -9346,10 +10051,11 @@ let }; - MailTools = buildPerlPackage rec { - name = "MailTools-2.20"; + MailTools = buildPerlPackage { + pname = "MailTools"; + version = "2.20"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.20.tar.gz; sha256 = "15iizg2x1w7ca0r8rn3wwhp7w160ljvf55prspljwd6cm7vhcmpm"; }; propagatedBuildInputs = [ TimeDate ]; @@ -9359,8 +10065,9 @@ let }; }; - MailTransport = buildPerlPackage rec { - name = "Mail-Transport-3.003"; + MailTransport = buildPerlPackage { + pname = "Mail-Transport"; + version = "3.003"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.003.tar.gz; sha256 = "0lb1awpk2wcnn5wg663982jl45x9fdn8ikxscayscxa16rim116p"; @@ -9372,18 +10079,20 @@ let }; }; - MathLibm = buildPerlPackage rec { - name = "Math-Libm-1.00"; + MathLibm = buildPerlPackage { + pname = "Math-Libm"; + version = "1.00"; src = fetchurl { url = mirror://cpan/authors/id/D/DS/DSLEWART/Math-Libm-1.00.tar.gz; sha256 = "0xn2a950mzzs5q1c4q98ckysn9dz20x7r35g02zvk35chgr0klxz"; }; }; - MathCalcUnits = buildPerlPackage rec { - name = "Math-Calc-Units-1.07"; + MathCalcUnits = buildPerlPackage { + pname = "Math-Calc-Units"; + version = "1.07"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SF/SFINK/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SF/SFINK/Math-Calc-Units-1.07.tar.gz; sha256 = "13wgbxv2fmigdj0vf7nwkq1y2q07jgfj8wdrpqkywfxv4zdwzqv1"; }; meta = { @@ -9392,10 +10101,11 @@ let }; }; - MathBigInt = buildPerlPackage rec { - name = "Math-BigInt-1.999816"; + MathBigInt = buildPerlPackage { + pname = "Math-BigInt"; + version = "1.999816"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-1.999816.tar.gz; sha256 = "95a5a1f636a23f66d400d40bffb0d24ad50df00e6e3c7359c9e645c375f40a89"; }; meta = { @@ -9404,10 +10114,11 @@ let }; }; - MathBigIntGMP = buildPerlPackage rec { - name = "Math-BigInt-GMP-1.6006"; + MathBigIntGMP = buildPerlPackage { + pname = "Math-BigInt-GMP"; + version = "1.6006"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-GMP-1.6006.tar.gz; sha256 = "10dg3h5jgc30pb2800x8brz2ijicrpash0rwjahp82xnvysi1hhf"; }; buildInputs = [ pkgs.gmp ]; @@ -9417,8 +10128,9 @@ let propagatedBuildInputs = [ MathBigInt ]; }; - MathBigIntLite = buildPerlPackage rec { - name = "Math-BigInt-Lite-0.18"; + MathBigIntLite = buildPerlPackage { + pname = "Math-BigInt-Lite"; + version = "0.18"; src = fetchurl { url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.18.tar.gz; sha256 = "1m97jkh26nrji6mjdwhwlq9bcdn8qlw3vimik8bs2hw80syi70j4"; @@ -9429,10 +10141,11 @@ let }; }; - MathBigRat = buildPerlPackage rec { - name = "Math-BigRat-0.2614"; + MathBigRat = buildPerlPackage { + pname = "Math-BigRat"; + version = "0.2614"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigRat-0.2614.tar.gz; sha256 = "cea6c20afc6c10a3dc3b62a71df3f842dce13898443bd827242ff3f09f1f3d59"; }; meta = { @@ -9441,8 +10154,9 @@ let }; }; - MathClipper = buildPerlModule rec { - name = "Math-Clipper-1.27"; + MathClipper = buildPerlModule { + pname = "Math-Clipper"; + version = "1.27"; src = fetchurl { url = mirror://cpan/authors/id/S/SH/SHELDRAKE/Math-Clipper-1.27.tar.gz; sha256 = "0di8frcxa8laa5s0x4vkr2mp9abv2a099c3x4gsdpnbijj10j6dn"; @@ -9451,8 +10165,9 @@ let buildInputs = [ ExtUtilsCppGuess ExtUtilsTypemapsDefault ExtUtilsXSpp ModuleBuildWithXSpp TestDeep ]; }; - MathConvexHullMonotoneChain = buildPerlPackage rec { - name = "Math-ConvexHull-MonotoneChain-0.01"; + MathConvexHullMonotoneChain = buildPerlPackage { + pname = "Math-ConvexHull-MonotoneChain"; + version = "0.01"; src = fetchurl { url = mirror://cpan/authors/id/S/SM/SMUELLER/Math-ConvexHull-MonotoneChain-0.01.tar.gz; sha256 = "1xcl7cz62ydddji9qzs4xsfxss484jqjlj4iixa4aci611cw92r8"; @@ -9460,7 +10175,8 @@ let }; MathGMP = buildPerlPackage { - name = "Math-GMP-2.19"; + pname = "Math-GMP"; + version = "2.19"; src = fetchurl { url = mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.19.tar.gz; sha256 = "1c07521m4d38hy2yx21hkwz22n2672bvrc4i21ldc68h85qy1q8i"; @@ -9474,8 +10190,9 @@ let }; }; - MathGeometryVoronoi = buildPerlPackage rec { - name = "Math-Geometry-Voronoi-1.3"; + MathGeometryVoronoi = buildPerlPackage { + pname = "Math-Geometry-Voronoi"; + version = "1.3"; src = fetchurl { url = mirror://cpan/authors/id/S/SA/SAMTREGAR/Math-Geometry-Voronoi-1.3.tar.gz; sha256 = "0b206k2q5cznld45cjhgm0as0clc9hk135ds8qafbkl3k175w1vj"; @@ -9484,7 +10201,8 @@ let }; MathInt128 = buildPerlPackage { - name = "Math-Int128-0.22"; + pname = "Math-Int128"; + version = "0.22"; src = fetchurl { url = mirror://cpan/authors/id/S/SA/SALVA/Math-Int128-0.22.tar.gz; sha256 = "1g0ra7ldv4fz3kqqg45dlrfavi2abfmlhf0py5ank1jk2x0clc56"; @@ -9497,7 +10215,8 @@ let }; MathInt64 = buildPerlPackage { - name = "Math-Int64-0.54"; + pname = "Math-Int64"; + version = "0.54"; src = fetchurl { url = mirror://cpan/authors/id/S/SA/SALVA/Math-Int64-0.54.tar.gz; sha256 = "0lfkc0cry65lnsi28gjyz2kvdkanbhhpc0pyrswsczj3k3k53z6w"; @@ -9508,10 +10227,11 @@ let }; }; - MathPlanePath = buildPerlPackage rec { - name = "Math-PlanePath-126"; + MathPlanePath = buildPerlPackage { + pname = "Math-PlanePath"; + version = "126"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KR/KRYDE/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KR/KRYDE/Math-PlanePath-126.tar.gz; sha256 = "014gr79gg992paas6v1glciyycqp2hg7pg4y03kgfbxz1slc6zhq"; }; propagatedBuildInputs = [ MathLibm constant-defer ]; @@ -9519,7 +10239,8 @@ let }; MathRandomISAAC = buildPerlPackage { - name = "Math-Random-ISAAC-1.004"; + pname = "Math-Random-ISAAC"; + version = "1.004"; src = fetchurl { url = mirror://cpan/authors/id/J/JA/JAWNSY/Math-Random-ISAAC-1.004.tar.gz; sha256 = "0z1b3xbb3xz71h25fg6jgsccra7migq7s0vawx2rfzi0pwpz0wr7"; @@ -9532,7 +10253,8 @@ let }; MathRandomMTAuto = buildPerlPackage { - name = "Math-Random-MT-Auto-6.23"; + pname = "Math-Random-MT-Auto"; + version = "6.23"; src = fetchurl { url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Math-Random-MT-Auto-6.23.tar.gz; sha256 = "04v3fxbqg6bs7dpljw64v62jqb10l2xdrln4l3slz5k266nvbg2q"; @@ -9545,7 +10267,8 @@ let }; MathRandomSecure = buildPerlPackage { - name = "Math-Random-Secure-0.080001"; + pname = "Math-Random-Secure"; + version = "0.080001"; src = fetchurl { url = mirror://cpan/authors/id/F/FR/FREW/Math-Random-Secure-0.080001.tar.gz; sha256 = "0dgbf4ncll4kmgkyb9fsaxn0vf2smc9dmwqzgh3259zc2zla995z"; @@ -9558,16 +10281,18 @@ let }; }; - MathRound = buildPerlPackage rec { - name = "Math-Round-0.07"; + MathRound = buildPerlPackage { + pname = "Math-Round"; + version = "0.07"; src = fetchurl { url = mirror://cpan/authors/id/G/GR/GROMMEL/Math-Round-0.07.tar.gz; sha256 = "09wkvqj4hfq9y0fimri967rmhnq90dc2wf20lhlmqjp5hsd359vk"; }; }; - MathVecStat = buildPerlPackage rec { - name = "Math-VecStat-0.08"; + MathVecStat = buildPerlPackage { + pname = "Math-VecStat"; + version = "0.08"; src = fetchurl { url = mirror://cpan/authors/id/A/AS/ASPINELLI/Math-VecStat-0.08.tar.gz; sha256 = "03bdcl9pn2bc9b50c50nhnr7m9wafylnb3v21zlch98h9c78x6j0"; @@ -9575,7 +10300,8 @@ let }; MaxMindDBCommon = buildPerlPackage { - name = "MaxMind-DB-Common-0.040001"; + pname = "MaxMind-DB-Common"; + version = "0.040001"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Common-0.040001.tar.gz; sha256 = "1mqvnabskhyvi2f10f602gisfk39ws51ky55lixd0033sd5xzikb"; @@ -9588,7 +10314,8 @@ let }; MaxMindDBReader = buildPerlPackage { - name = "MaxMind-DB-Reader-1.000013"; + pname = "MaxMind-DB-Reader"; + version = "1.000013"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-1.000013.tar.gz; sha256 = "0w7dmfhpibazrh75bdr7vmpji83fzldsy0zjvhg3cwadr4f35kmq"; @@ -9602,7 +10329,8 @@ let }; MaxMindDBReaderXS = buildPerlModule { - name = "MaxMind-DB-Reader-XS-1.000007"; + pname = "MaxMind-DB-Reader-XS"; + version = "1.000007"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-XS-1.000007.tar.gz; sha256 = "1wg1x1pqamapfhn6rbffqipncgs15k99q34agdamv76i6782ny8r"; @@ -9616,7 +10344,8 @@ let }; MaxMindDBWriter = buildPerlModule { - name = "MaxMind-DB-Writer-0.300003"; + pname = "MaxMind-DB-Writer"; + version = "0.300003"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Writer-0.300003.tar.gz; sha256 = "0gpbrlmxjl45k0wg5v9ghw415hd0fns9fk8ncxzlfyjzjsxgalxs"; @@ -9631,15 +10360,17 @@ let }; Memoize = buildPerlPackage { - name = "Memoize-1.03"; + pname = "Memoize"; + version = "1.03"; src = fetchurl { url = mirror://cpan/authors/id/M/MJ/MJD/Memoize-1.03.tgz; sha256 = "5239cc5f644a50b0de9ffeaa51fa9991eb06ecb1bf4678873e3ab89af9c0daf3"; }; }; - MemoizeExpireLRU = buildPerlPackage rec { - name = "Memoize-ExpireLRU-0.56"; + MemoizeExpireLRU = buildPerlPackage { + pname = "Memoize-ExpireLRU"; + version = "0.56"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEILB/Memoize-ExpireLRU-0.56.tar.gz; sha256 = "1xnp3jqabl4il5kfadlqimbxhzsbm7gpwrgw0m5s5fdsrc0n70zf"; @@ -9651,10 +10382,11 @@ let }; }; - Menlo = buildPerlPackage rec { - name = "Menlo-1.9019"; + Menlo = buildPerlPackage { + pname = "Menlo"; + version = "1.9019"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Menlo-1.9019.tar.gz; sha256 = "3b573f68e7b3a36a87c860be258599330fac248b518854dfb5657ac483dca565"; }; propagatedBuildInputs = [ CPANCommonIndex CPANDistnameInfo CPANMetaCheck CaptureTiny ClassTiny ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths FileWhich Filepushd HTTPTinyish ModuleCPANfile ParsePMFile StringShellQuote URI Win32ShellQuote locallib ]; @@ -9665,10 +10397,11 @@ let }; }; - MenloLegacy = buildPerlPackage rec { - name = "Menlo-Legacy-1.9022"; + MenloLegacy = buildPerlPackage { + pname = "Menlo-Legacy"; + version = "1.9022"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Menlo-Legacy-1.9022.tar.gz; sha256 = "a6acac3fee318a804b439de54acbc7c27f0b44cfdad8551bbc9cd45986abc201"; }; propagatedBuildInputs = [ Menlo ]; @@ -9680,7 +10413,8 @@ let }; MetaBuilder = buildPerlModule { - name = "Meta-Builder-0.004"; + pname = "Meta-Builder"; + version = "0.004"; src = fetchurl { url = mirror://cpan/authors/id/E/EX/EXODIST/Meta-Builder-0.004.tar.gz; sha256 = "acb499aa7206eb9db21eb85357a74521bfe3bdae4a6416d50a7c75b939cf56fe"; @@ -9693,7 +10427,8 @@ let }; MethodSignaturesSimple = buildPerlPackage { - name = "Method-Signatures-Simple-1.07"; + pname = "Method-Signatures-Simple"; + version = "1.07"; src = fetchurl { url = mirror://cpan/authors/id/R/RH/RHESA/Method-Signatures-Simple-1.07.tar.gz; sha256 = "1p6sf6iyyn73pc89mfr65bzxvbw1ibcsp4j10iv8ik3p353pvkf8"; @@ -9705,11 +10440,12 @@ let }; }; - MHonArc = buildPerlPackage rec { - name = "MHonArc-2.6.18"; + MHonArc = buildPerlPackage { + pname = "MHonArc"; + version = "2.6.18"; src = fetchurl { - url = "http://dcssrv1.oit.uci.edu/indiv/ehood/release/MHonArc/tar/${name}.tar.gz"; + url = "http://dcssrv1.oit.uci.edu/indiv/ehood/release/MHonArc/tar/MHonArc-2.6.18.tar.gz"; sha256 = "1xmf26dfwr8achprc3n1pxgl0mkiyr6pf25wq3dqgzqkghrrsxa2"; }; outputs = [ "out" "dev" ]; # no "devdoc" @@ -9725,7 +10461,8 @@ let }; MIMECharset = buildPerlPackage { - name = "MIME-Charset-1.012.2"; + pname = "MIME-Charset"; + version = "1.012.2"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.012.2.tar.gz; sha256 = "878c779c0256c591666bd06c0cde4c0d7820eeeb98fd1183082aee9a1e7b1d13"; @@ -9736,20 +10473,22 @@ let }; }; - mimeConstruct = buildPerlPackage rec { - name = "mime-construct-1.11"; + mimeConstruct = buildPerlPackage { + pname = "mime-construct"; + version = "1.11"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROSCH/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RO/ROSCH/mime-construct-1.11.tar.gz; sha256 = "00wk9950i9q6qwp1vdq9xdddgk54lqd0bhcq2hnijh8xnmhvpmsc"; }; outputs = [ "out" ]; buildInputs = [ ProcWaitStat ]; }; - MIMELite = buildPerlPackage rec { - name = "MIME-Lite-3.030"; + MIMELite = buildPerlPackage { + pname = "MIME-Lite"; + version = "3.030"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/MIME-Lite-3.030.tar.gz; sha256 = "8f39901bc580bc3dce69e10415305e4435ff90264c63d29f707b4566460be962"; }; propagatedBuildInputs = [ EmailDateFormat ]; @@ -9759,8 +10498,9 @@ let }; }; - MIMETools = buildPerlPackage rec { - name = "MIME-tools-5.509"; + MIMETools = buildPerlPackage { + pname = "MIME-tools"; + version = "5.509"; src = fetchurl { url = mirror://cpan/authors/id/D/DS/DSKOLL/MIME-tools-5.509.tar.gz; sha256 = "0wv9rzx5j1wjm01c3dg48qk9wlbm6iyf91j536idk09xj869ymv4"; @@ -9773,10 +10513,11 @@ let }; }; - MIMETypes = buildPerlPackage rec { - name = "MIME-Types-2.17"; + MIMETypes = buildPerlPackage { + pname = "MIME-Types"; + version = "2.17"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.17.tar.gz; sha256 = "1xlg7q6h8zyb8534sy0iqn90py18kilg419q6051bwqz5zadfkp0"; }; meta = { @@ -9785,10 +10526,11 @@ let }; }; - MixinLinewise = buildPerlPackage rec { - name = "Mixin-Linewise-0.108"; + MixinLinewise = buildPerlPackage { + pname = "Mixin-Linewise"; + version = "0.108"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Mixin-Linewise-0.108.tar.gz; sha256 = "7df20678474c0973930a472b0c55e3f8e85b7790b68ab18ef618f9c453c8aef2"; }; propagatedBuildInputs = [ PerlIOutf8_strict SubExporter ]; @@ -9799,10 +10541,11 @@ let }; }; - MLDBM = buildPerlModule rec { - name = "MLDBM-2.05"; + MLDBM = buildPerlModule { + pname = "MLDBM"; + version = "2.05"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHORNY/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CH/CHORNY/MLDBM-2.05.tar.gz; sha256 = "586880ed0c20801abbf6734747e13e0203edefece6ebc4f20ddb5059f02a17a2"; }; meta = { @@ -9813,8 +10556,9 @@ let MNI-Perllib = callPackage ../development/perl-modules/MNI {}; - Mo = buildPerlPackage rec { - name = "Mo-0.40"; + Mo = buildPerlPackage { + pname = "Mo"; + version = "0.40"; src = fetchurl { url = mirror://cpan/authors/id/T/TI/TINITA/Mo-0.40.tar.gz; sha256 = "1fff81awg9agfawf3wxx0gpf6vgav8w920rmxsbjg30z75943lli"; @@ -9826,8 +10570,9 @@ let }; }; - MockConfig = buildPerlPackage rec { - name = "Mock-Config-0.03"; + MockConfig = buildPerlPackage { + pname = "Mock-Config"; + version = "0.03"; src = fetchurl { url = mirror://cpan/authors/id/R/RU/RURBAN/Mock-Config-0.03.tar.gz; sha256 = "06q0xkg5cwdwafzmb9rkaa305ddv7vli9gpm6n9jnkyaaxbk9f55"; @@ -9839,7 +10584,8 @@ let }; ModernPerl = buildPerlPackage { - name = "Modern-Perl-1.20181021"; + pname = "Modern-Perl"; + version = "1.20181021"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20181021.tar.gz; @@ -9852,10 +10598,11 @@ let }; }; - ModuleBuild = buildPerlPackage rec { - name = "Module-Build-0.4229"; + ModuleBuild = buildPerlPackage { + pname = "Module-Build"; + version = "0.4229"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; + url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4229.tar.gz; sha256 = "064c03wxia7jz0i578awj4srykj0nnigm4p5r0dv0559rnk93r0z"; }; meta = { @@ -9865,7 +10612,8 @@ let }; ModuleBuildDeprecated = buildPerlModule { - name = "Module-Build-Deprecated-0.4210"; + pname = "Module-Build-Deprecated"; + version = "0.4210"; src = fetchurl { url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Deprecated-0.4210.tar.gz; sha256 = "be089313fc238ee2183473aca8c86b55fb3cf44797312cbe9b892d6362621703"; @@ -9877,10 +10625,11 @@ let }; }; - ModuleBuildPluggable = buildPerlModule rec { - name = "Module-Build-Pluggable-0.10"; + ModuleBuildPluggable = buildPerlModule { + pname = "Module-Build-Pluggable"; + version = "0.10"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Module-Build-Pluggable-0.10.tar.gz; sha256 = "e5bb2acb117792c984628812acb0fec376cb970caee8ede57535e04d762b0e40"; }; propagatedBuildInputs = [ ClassAccessorLite ClassMethodModifiers DataOptList ]; @@ -9892,10 +10641,11 @@ let buildInputs = [ TestSharedFork ]; }; - ModuleBuildPluggablePPPort = buildPerlModule rec { - name = "Module-Build-Pluggable-PPPort-0.04"; + ModuleBuildPluggablePPPort = buildPerlModule { + pname = "Module-Build-Pluggable-PPPort"; + version = "0.04"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Module-Build-Pluggable-PPPort-0.04.tar.gz; sha256 = "44084ba3d8815f343bd391585ac5d8339a4807ce5c0dd84c98db8f310b64c0ea"; }; buildInputs = [ TestRequires TestSharedFork ]; @@ -9907,7 +10657,8 @@ let }; ModuleBuildTiny = buildPerlModule { - name = "Module-Build-Tiny-0.039"; + pname = "Module-Build-Tiny"; + version = "0.039"; src = fetchurl { url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz; sha256 = "7d580ff6ace0cbe555bf36b86dc8ea232581530cbeaaea09bccb57b55797f11c"; @@ -9920,19 +10671,21 @@ let }; }; - ModuleBuildWithXSpp = buildPerlModule rec { - name = "Module-Build-WithXSpp-0.14"; + ModuleBuildWithXSpp = buildPerlModule { + pname = "Module-Build-WithXSpp"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SM/SMUELLER/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SM/SMUELLER/Module-Build-WithXSpp-0.14.tar.gz; sha256 = "0d39fjg9c0n820bk3fb50vvlwhdny4hdl69xmlyzql5xzp4cicsk"; }; propagatedBuildInputs = [ ExtUtilsCppGuess ExtUtilsXSpp ]; }; - ModuleBuildXSUtil = buildPerlModule rec { - name = "Module-Build-XSUtil-0.19"; + ModuleBuildXSUtil = buildPerlModule { + pname = "Module-Build-XSUtil"; + version = "0.19"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HI/HIDEAKIO/${name}.tar.gz"; + url = mirror://cpan/authors/id/H/HI/HIDEAKIO/Module-Build-XSUtil-0.19.tar.gz; sha256 = "004ly9xxjlsbrr2vhxsa1n84z3034gxrzr7z0wl45szd8v1v6qwh"; }; buildInputs = [ CaptureTiny CwdGuard FileCopyRecursiveReduced ]; @@ -9944,8 +10697,9 @@ let }; }; - ModuleCPANTSAnalyse = buildPerlPackage rec { - name = "Module-CPANTS-Analyse-1.00"; + ModuleCPANTSAnalyse = buildPerlPackage { + pname = "Module-CPANTS-Analyse"; + version = "1.00"; src = fetchurl { url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-1.00.tar.gz; sha256 = "0r77g2h0d3p81scf294x5qkvi76hzwvbfji0m86abidjav5jk6a2"; @@ -9959,8 +10713,9 @@ let }; }; - ModuleCPANfile = buildPerlPackage rec { - name = "Module-CPANfile-1.1004"; + ModuleCPANfile = buildPerlPackage { + pname = "Module-CPANfile"; + version = "1.1004"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Module-CPANfile-1.1004.tar.gz; sha256 = "08a9a5mybf0llwlfvk7n0q7az6lrrzgzwc3432mcwbb4k8pbxvw8"; @@ -9973,8 +10728,9 @@ let buildInputs = [ Filepushd ]; }; - ModuleExtractUse = buildPerlModule rec { - name = "Module-ExtractUse-0.343"; + ModuleExtractUse = buildPerlModule { + pname = "Module-ExtractUse"; + version = "0.343"; src = fetchurl { url = mirror://cpan/authors/id/D/DO/DOMM/Module-ExtractUse-0.343.tar.gz; sha256 = "00hcggwnqk953s4zbvkcabd5mfidg60hawlqsw6146in91dlclj8"; @@ -9988,7 +10744,8 @@ let }; ModuleFind = buildPerlPackage { - name = "Module-Find-0.13"; + pname = "Module-Find"; + version = "0.13"; src = fetchurl { url = mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.13.tar.gz; sha256 = "0s45y5lvd9k89g7lds83c0bn1p29c13hfsbrd7x64jfaf8h8cisa"; @@ -9999,23 +10756,24 @@ let }; }; - ModuleImplementation = let version = "0.09"; in buildPerlPackage { - name = "Module-Implementation-${version}"; + ModuleImplementation = buildPerlPackage { + pname = "Module-Implementation"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Module-Implementation-${version}.tar.gz"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Module-Implementation-0.09.tar.gz; sha256 = "0vfngw4dbryihqhi7g9ks360hyw8wnpy3hpkzyg0q4y2y091lpy1"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ModuleRuntime TryTiny ]; meta = { - inherit version; description = "Loads one of several alternate underlying implementations for a module"; license = stdenv.lib.licenses.artistic2; }; }; - ModuleInfo = buildPerlPackage rec { - name = "Module-Info-0.37"; + ModuleInfo = buildPerlPackage { + pname = "Module-Info"; + version = "0.37"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEILB/Module-Info-0.37.tar.gz; sha256 = "0j143hqxgdkdpj5qssppq72gjr0n73c4f7is6wgrrcchjx905a4f"; @@ -10028,10 +10786,11 @@ let propagatedBuildInputs = [ BUtils ]; }; - ModuleInstall = let version = "1.19"; in buildPerlPackage { - name = "Module-Install-${version}"; + ModuleInstall = buildPerlPackage { + pname = "Module-Install"; + version = "1.19"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Module-Install-${version}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/Module-Install-1.19.tar.gz; sha256 = "06q12cm97yh4p7qbm0a2p96996ii6ss59qy57z0f7f9svy6sflqs"; }; propagatedBuildInputs = [ FileRemove ModuleBuild ModuleScanDeps YAMLTiny ]; @@ -10042,7 +10801,8 @@ let }; ModuleInstallAuthorRequires = buildPerlPackage { - name = "Module-Install-AuthorRequires-0.02"; + pname = "Module-Install-AuthorRequires"; + version = "0.02"; src = fetchurl { url = mirror://cpan/authors/id/F/FL/FLORA/Module-Install-AuthorRequires-0.02.tar.gz; sha256 = "1v2ciw75dj5y8lh10d1vrhwmjx266gpqavr8m21jlpblgm9j2qyc"; @@ -10055,7 +10815,8 @@ let }; ModuleInstallAuthorTests = buildPerlPackage { - name = "Module-Install-AuthorTests-0.002"; + pname = "Module-Install-AuthorTests"; + version = "0.002"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Module-Install-AuthorTests-0.002.tar.gz; sha256 = "121dyggy38316xss06v1zkwx4b59gl7b00c5q99xyzimwqnp49a0"; @@ -10068,7 +10829,8 @@ let }; ModuleManifest = buildPerlPackage { - name = "Module-Manifest-1.09"; + pname = "Module-Manifest"; + version = "1.09"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Module-Manifest-1.09.tar.gz; sha256 = "a395f80ff15ea0e66fd6c453844b6787ed4a875a3cd8df9f7e29280250bd539b"; @@ -10081,10 +10843,11 @@ let }; }; - ModulePath = buildPerlPackage rec { - name = "Module-Path-0.19"; + ModulePath = buildPerlPackage { + pname = "Module-Path"; + version = "0.19"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NE/NEILB/Module-Path-0.19.tar.gz; sha256 = "b33179ce4dd73dfcde7d46808804b9ffbb11db0245fe455a7d001747562feaca"; }; buildInputs = [ DevelFindPerl ]; @@ -10095,10 +10858,11 @@ let }; }; - ModulePluggable = buildPerlPackage rec { - name = "Module-Pluggable-5.2"; + ModulePluggable = buildPerlPackage { + pname = "Module-Pluggable"; + version = "5.2"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SI/SIMONW/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-5.2.tar.gz; sha256 = "b3f2ad45e4fd10b3fb90d912d78d8b795ab295480db56dc64e86b9fa75c5a6df"; }; patches = [ @@ -10113,7 +10877,8 @@ let }; ModulePluggableFast = buildPerlPackage { - name = "Module-Pluggable-Fast-0.19"; + pname = "Module-Pluggable-Fast"; + version = "0.19"; src = fetchurl { url = mirror://cpan/authors/id/M/MR/MRAMBERG/Module-Pluggable-Fast-0.19.tar.gz; sha256 = "0pq758wlasmh77xyd2xh75m5b2x14s8pnsv63g5356gib1q5gj08"; @@ -10122,7 +10887,8 @@ let }; ModuleRefresh = buildPerlPackage { - name = "Module-Refresh-0.17"; + pname = "Module-Refresh"; + version = "0.17"; src = fetchurl { url = mirror://cpan/authors/id/A/AL/ALEXMV/Module-Refresh-0.17.tar.gz; sha256 = "6b30a6ceddc6512ab4490c16372ecf309a259f2ca147d622e478ac54e08511c3"; @@ -10135,7 +10901,8 @@ let }; ModuleRuntime = buildPerlModule { - name = "Module-Runtime-0.016"; + pname = "Module-Runtime"; + version = "0.016"; src = fetchurl { url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.016.tar.gz; sha256 = "097hy2czwkxlppri32m599ph0xfvfsbf0a5y23a4fdc38v32wc38"; @@ -10147,7 +10914,8 @@ let }; ModuleRuntimeConflicts = buildPerlPackage { - name = "Module-Runtime-Conflicts-0.003"; + pname = "Module-Runtime-Conflicts"; + version = "0.003"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Module-Runtime-Conflicts-0.003.tar.gz; sha256 = "707cdc75038c70fe91779b888ac050f128565d3967ba96680e1b1c7cc9733875"; @@ -10160,22 +10928,23 @@ let }; }; - ModuleScanDeps = let version = "1.27"; in buildPerlPackage { - name = "Module-ScanDeps-${version}"; + ModuleScanDeps = buildPerlPackage { + pname = "Module-ScanDeps"; + version = "1.27"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-${version}.tar.gz"; + url = mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.27.tar.gz; sha256 = "0j6r9r99x5p0i6fv06i44wpsvjxj32amjkiqf6pmqpj80jff2k7f"; }; buildInputs = [ TestRequires ]; meta = { - inherit version; description = "Recursively scan Perl code for dependencies"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; ModuleSignature = buildPerlPackage { - name = "Module-Signature-0.83"; + pname = "Module-Signature"; + version = "0.83"; src = fetchurl { url = mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-0.83.tar.gz; sha256 = "3c15f3845a85d2a76a81253be53cb0f716465a3f696eb9c50e92eef34e9601cb"; @@ -10188,7 +10957,8 @@ let }; ModuleUtil = buildPerlModule { - name = "Module-Util-1.09"; + pname = "Module-Util"; + version = "1.09"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MATTLAW/Module-Util-1.09.tar.gz; sha256 = "6cfbcb6a45064446ec8aa0ee1a7dddc420b54469303344187aef84d2c7f3e2c6"; @@ -10200,7 +10970,8 @@ let }; ModuleVersions = buildPerlPackage { - name = "Module-Versions-0.02"; + pname = "Module-Versions"; + version = "0.02"; src = fetchurl { url = mirror://cpan/authors/id/T/TH/THW/Module-Versions-0.02.zip; sha256 = "0g7qs6vqg91xpwg1cdy91m3kh9m1zbkzyz1qsy453b572xdscf0d"; @@ -10209,7 +10980,8 @@ let }; ModuleVersionsReport = buildPerlPackage { - name = "Module-Versions-Report-1.06"; + pname = "Module-Versions-Report"; + version = "1.06"; src = fetchurl { url = mirror://cpan/authors/id/J/JE/JESSE/Module-Versions-Report-1.06.tar.gz; sha256 = "a3261d0d84b17678d8c4fd55eb0f892f5144d81ca53ea9a38d75d1a00ad9796a"; @@ -10221,7 +10993,8 @@ let }; mod_perl2 = buildPerlPackage { - name = "mod_perl-2.0.10"; + pname = "mod_perl"; + version = "2.0.10"; src = fetchurl { url = mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.10.tar.gz; sha256 = "0r1bhzwl5gr0202r6448943hjxsickzn55kdmb7dzad39vnq7kyi"; @@ -10235,10 +11008,11 @@ let }; }; - Mojolicious = buildPerlPackage rec { - name = "Mojolicious-8.14"; + Mojolicious = buildPerlPackage { + pname = "Mojolicious"; + version = "8.14"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.14.tar.gz; sha256 = "0dammdx51cyqn2b35yihk85gz1blgw85w6jv6h04cv4cdahph59q"; }; meta = { @@ -10249,10 +11023,11 @@ let }; }; - MojoliciousPluginStatus = buildPerlPackage rec { - name = "Mojolicious-Plugin-Status-1.0"; + MojoliciousPluginStatus = buildPerlPackage { + pname = "Mojolicious-Plugin-Status"; + version = "1.0"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.0.tar.gz; sha256 = "14ypg679dk9yvgq67mp7lzs131cxhbgcmrpx5f4ddqcrs1bzq5rb"; }; propagatedBuildInputs = [ BSDResource IPCShareLite Mojolicious Sereal ]; @@ -10264,10 +11039,11 @@ let }; }; - MojoIOLoopForkCall = buildPerlModule rec { - name = "Mojo-IOLoop-ForkCall-0.20"; + MojoIOLoopForkCall = buildPerlModule { + pname = "Mojo-IOLoop-ForkCall"; + version = "0.20"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JB/JBERGER/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JB/JBERGER/Mojo-IOLoop-ForkCall-0.20.tar.gz; sha256 = "2b9962244c25a71e4757356fb3e1237cf869e26d1c27215115ba7b057a81f1a6"; }; propagatedBuildInputs = [ IOPipely Mojolicious ]; @@ -10277,10 +11053,11 @@ let }; }; - MonitoringPlugin = buildPerlPackage rec { - name = "Monitoring-Plugin-0.40"; + MonitoringPlugin = buildPerlPackage { + pname = "Monitoring-Plugin"; + version = "0.40"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NI/NIERLEIN/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NI/NIERLEIN/Monitoring-Plugin-0.40.tar.gz; sha256 = "0vr3wwdn3zs246qwi04bqk8jir6l88j5m59jk97hmfyj4xz6pfpq"; }; propagatedBuildInputs = [ ClassAccessor ConfigTiny MathCalcUnits ParamsValidate ]; @@ -10293,10 +11070,11 @@ let }; }; - IOPipely = buildPerlPackage rec { - name = "IO-Pipely-0.005"; + IOPipely = buildPerlPackage { + pname = "IO-Pipely"; + version = "0.005"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RC/RCAPUTO/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RC/RCAPUTO/IO-Pipely-0.005.tar.gz; sha256 = "e33b6cf5cb2b46ee308513f51e623987a50a89901e81bf19701dce35179f2e74"; }; meta = { @@ -10305,10 +11083,11 @@ let }; }; - Moo = buildPerlPackage rec { - name = "Moo-2.003004"; + Moo = buildPerlPackage { + pname = "Moo"; + version = "2.003004"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; + url = mirror://cpan/authors/id/H/HA/HAARG/Moo-2.003004.tar.gz; sha256 = "f8bbb625f8e963eabe05cff9048fdd72bdd26777404ff2c40bc690f558be91e1"; }; buildInputs = [ TestFatal ]; @@ -10320,7 +11099,8 @@ let }; Moose = buildPerlPackage { - name = "Moose-2.2011"; + pname = "Moose"; + version = "2.2011"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2011.tar.gz; sha256 = "973d0a35d9f39bf93bbc5206c25f5ec3651f96356f082d31873c0ac9a5c1cd82"; @@ -10338,10 +11118,11 @@ let }; }; - MooXHandlesVia = buildPerlPackage rec { - name = "MooX-HandlesVia-0.001008"; + MooXHandlesVia = buildPerlPackage { + pname = "MooX-HandlesVia"; + version = "0.001008"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MATTP/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MATTP/MooX-HandlesVia-0.001008.tar.gz; sha256 = "b0946f23b3537763b8a96b8a83afcdaa64fce4b45235e98064845729acccfe8c"; }; buildInputs = [ MooXTypesMooseLike TestException TestFatal ]; @@ -10352,8 +11133,9 @@ let }; }; - MooXLocalePassthrough = buildPerlPackage rec { - name = "MooX-Locale-Passthrough-0.001"; + MooXLocalePassthrough = buildPerlPackage { + pname = "MooX-Locale-Passthrough"; + version = "0.001"; src = fetchurl { url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Locale-Passthrough-0.001.tar.gz; sha256 = "04h5xhqdvydd4xk9ckb6a79chn0ygf915ix55vg1snmba9z841bs"; @@ -10365,8 +11147,9 @@ let }; }; - MooXLocaleTextDomainOO = buildPerlPackage rec { - name = "MooX-Locale-TextDomain-OO-0.001"; + MooXLocaleTextDomainOO = buildPerlPackage { + pname = "MooX-Locale-TextDomain-OO"; + version = "0.001"; src = fetchurl { url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Locale-TextDomain-OO-0.001.tar.gz; sha256 = "0g8pwj45ccqrzvs9cqyhw29nm68vai1vj46ad39rajnqzp7m53jv"; @@ -10378,8 +11161,9 @@ let }; }; - MooXOptions = buildPerlPackage rec { - name = "MooX-Options-4.103"; + MooXOptions = buildPerlPackage { + pname = "MooX-Options"; + version = "4.103"; src = fetchurl { url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Options-4.103.tar.gz; sha256 = "0v9j0wxx4f6z6lrmdqf2k084b2c2f2jbvh86pwib0vgjz1sdbyad"; @@ -10392,8 +11176,9 @@ let }; }; - MooXSingleton = buildPerlModule rec { - name = "MooX-Singleton-1.20"; + MooXSingleton = buildPerlModule { + pname = "MooX-Singleton"; + version = "1.20"; src = fetchurl { url = mirror://cpan/authors/id/A/AJ/AJGB/MooX-Singleton-1.20.tar.gz; sha256 = "03i1wfag279ldjjkwi9gvpfs8fgi05my47icq5ggi66yzxpn5mzp"; @@ -10406,8 +11191,9 @@ let }; }; - MooXStrictConstructor = buildPerlPackage rec { - name = "MooX-StrictConstructor-0.010"; + MooXStrictConstructor = buildPerlPackage { + pname = "MooX-StrictConstructor"; + version = "0.010"; src = fetchurl { url = mirror://cpan/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.010.tar.gz; sha256 = "0vvjgz7xbfmf69yav7sxsxmvklqv835xvh7h47w0apxmlkm9fjgr"; @@ -10420,20 +11206,22 @@ let }; }; - MooXTypesMooseLike = buildPerlPackage rec { - name = "MooX-Types-MooseLike-0.29"; + MooXTypesMooseLike = buildPerlPackage { + pname = "MooX-Types-MooseLike"; + version = "0.29"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MATEU/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MATEU/MooX-Types-MooseLike-0.29.tar.gz; sha256 = "1d6jg9x3p7gm2r0xmbcag374a44gf5pcga2swvxhlhzakfm80dqx"; }; propagatedBuildInputs = [ ModuleRuntime ]; buildInputs = [ Moo TestFatal ]; }; - MooXTypesMooseLikeNumeric = buildPerlPackage rec { - name = "MooX-Types-MooseLike-Numeric-1.03"; + MooXTypesMooseLikeNumeric = buildPerlPackage { + pname = "MooX-Types-MooseLike-Numeric"; + version = "1.03"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MATEU/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MATEU/MooX-Types-MooseLike-Numeric-1.03.tar.gz; sha256 = "16adeb617b963d010179922c2e4e8762df77c75232e17320b459868c4970c44b"; }; buildInputs = [ Moo TestFatal ]; @@ -10445,7 +11233,8 @@ let }; MooseAutobox = buildPerlModule { - name = "Moose-Autobox-0.16"; + pname = "Moose-Autobox"; + version = "0.16"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Moose-Autobox-0.16.tar.gz; sha256 = "0mbhd0p7gf6qdhaylldl0ahq59zghs0vd5n1iqcbfkj8ryj1sh4j"; @@ -10459,7 +11248,8 @@ let }; MooseXABC = buildPerlPackage { - name = "MooseX-ABC-0.06"; + pname = "MooseX-ABC"; + version = "0.06"; src = fetchurl { url = mirror://cpan/authors/id/D/DO/DOY/MooseX-ABC-0.06.tar.gz; sha256 = "1sky0dpi22wrymmkjmqba4k966zn7vrbpx918wn2nmg48swyrgjf"; @@ -10472,20 +11262,22 @@ let }; }; - MooseXAliases = buildPerlPackage rec { - name = "MooseX-Aliases-0.11"; + MooseXAliases = buildPerlPackage { + pname = "MooseX-Aliases"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DO/DOY/MooseX-Aliases-0.11.tar.gz; sha256 = "0j07zqczjfmng3md6nkha7560i786d0cp3gdmrx49hr64jbhz1f4"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ Moose ]; }; - MooseXAppCmd = buildPerlModule rec { - name = "MooseX-App-Cmd-0.32"; + MooseXAppCmd = buildPerlModule { + pname = "MooseX-App-Cmd"; + version = "0.32"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-App-Cmd-0.32.tar.gz; sha256 = "2e3bbf7283a4bee72d91d26eb204436030992bbe55cbd35ec33a546f16f973ff"; }; buildInputs = [ ModuleBuildTiny MooseXConfigFromFile TestOutput YAML ]; @@ -10497,10 +11289,11 @@ let }; }; - MooX = buildPerlPackage rec { - name = "MooX-0.101"; + MooX = buildPerlPackage { + pname = "MooX"; + version = "0.101"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GE/GETTY/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GE/GETTY/MooX-0.101.tar.gz; sha256 = "2ff91a656e78aae0aca42293829d7a7e5acb9bf22b0401635b2ab6c870de32d5"; }; propagatedBuildInputs = [ DataOptList ImportInto Moo ]; @@ -10511,8 +11304,9 @@ let }; }; - MooXCmd = buildPerlPackage rec { - name = "MooX-Cmd-0.017"; + MooXCmd = buildPerlPackage { + pname = "MooX-Cmd"; + version = "0.017"; src = fetchurl { url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Cmd-0.017.tar.gz; sha256 = "1xbhmq07v9z371ygkyghva9aryhc22kwbzn5qwkp72c0ma6z4gwl"; @@ -10526,7 +11320,8 @@ let }; MooXlate = buildPerlPackage { - name = "MooX-late-0.015"; + pname = "MooX-late"; + version = "0.015"; src = fetchurl { url = mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.015.tar.gz; sha256 = "175326af3076fa8698669f289fad1322724978cddaf40ea04e600fcd7f6afbbf"; @@ -10540,7 +11335,8 @@ let }; MouseXSimpleConfig = buildPerlPackage { - name = "MouseX-SimpleConfig-0.11"; + pname = "MouseX-SimpleConfig"; + version = "0.11"; src = fetchurl { url = mirror://cpan/authors/id/M/MJ/MJGARDNER/MouseX-SimpleConfig-0.11.tar.gz; sha256 = "257f384091d33d340373a6153947039c698dc449d1ef989335644fc3d2da0069"; @@ -10553,7 +11349,8 @@ let }; TestUseAllModules = buildPerlPackage { - name = "Test-UseAllModules-0.17"; + pname = "Test-UseAllModules"; + version = "0.17"; src = fetchurl { url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Test-UseAllModules-0.17.tar.gz; sha256 = "a71f2fe8b96ab8bfc2760aa1d3135ea049a5b20dcb105457b769a1195c7a2509"; @@ -10565,7 +11362,8 @@ let }; MouseXTypesPathClass = buildPerlPackage { - name = "MouseX-Types-Path-Class-0.07"; + pname = "MouseX-Types-Path-Class"; + version = "0.07"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MASAKI/MouseX-Types-Path-Class-0.07.tar.gz; sha256 = "228d4b4f3f0ed9547278691d0b7c5fe53d90874a69df709a49703c6af87c09de"; @@ -10579,7 +11377,8 @@ let }; MouseXTypes = buildPerlPackage { - name = "MouseX-Types-0.06"; + pname = "MouseX-Types"; + version = "0.06"; src = fetchurl { url = mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Types-0.06.tar.gz; sha256 = "77288441fdadd15beeec9a0813ece8aec1542f1d8ceaaec14755b3f316fbcf8b"; @@ -10593,7 +11392,8 @@ let }; MouseXConfigFromFile = buildPerlPackage { - name = "MouseX-ConfigFromFile-0.05"; + pname = "MouseX-ConfigFromFile"; + version = "0.05"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MASAKI/MouseX-ConfigFromFile-0.05.tar.gz; sha256 = "921b31cb13fc1f982a602f8e23815b7add23a224257e43790e287504ce879534"; @@ -10606,10 +11406,11 @@ let }; }; - MouseXGetopt = buildPerlModule rec { - name = "MouseX-Getopt-0.38"; + MouseXGetopt = buildPerlModule { + pname = "MouseX-Getopt"; + version = "0.38"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Getopt-0.38.tar.gz; sha256 = "de3ea8ef452dd9501ea8c4eda8744b7224602602b04692607edd7d62b79f038f"; }; buildInputs = [ ModuleBuildTiny MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; @@ -10621,8 +11422,9 @@ let }; }; - MooseXAttributeChained = buildPerlModule rec { - name = "MooseX-Attribute-Chained-1.0.3"; + MooseXAttributeChained = buildPerlModule { + pname = "MooseX-Attribute-Chained"; + version = "1.0.3"; src = fetchurl { url = mirror://cpan/authors/id/T/TO/TOMHUKINS/MooseX-Attribute-Chained-1.0.3.tar.gz; sha256 = "0kjydmkxh8hpkbbmsgd5wrkhgq7w69lgfg6lx4s5g2xpqfkqmqz7"; @@ -10631,7 +11433,8 @@ let }; MooseXAttributeHelpers = buildPerlPackage { - name = "MooseX-AttributeHelpers-0.23"; + pname = "MooseX-AttributeHelpers"; + version = "0.23"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-AttributeHelpers-0.23.tar.gz; sha256 = "3f63f60d94d840a309d9137f78605e15f07c977fd15a4f4b55bd47b65ed52be1"; @@ -10646,7 +11449,8 @@ let }; MooseXClone = buildPerlModule { - name = "MooseX-Clone-0.06"; + pname = "MooseX-Clone"; + version = "0.06"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Clone-0.06.tar.gz; sha256 = "19wd74dihybnz1lbbsqn0clwxzb6y0aa0i25a8zhajz7p5fq5myb"; @@ -10655,10 +11459,11 @@ let buildInputs = [ ModuleBuildTiny ]; }; - MooseXConfigFromFile = buildPerlModule rec { - name = "MooseX-ConfigFromFile-0.14"; + MooseXConfigFromFile = buildPerlModule { + pname = "MooseX-ConfigFromFile"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-ConfigFromFile-0.14.tar.gz; sha256 = "9ad343cd9f86d714be9b54b9c68a443d8acc6501b6ad6b15e9ca0130b2e96f08"; }; buildInputs = [ ModuleBuildTiny TestDeep TestFatal TestRequires TestWithoutModule ]; @@ -10670,10 +11475,11 @@ let }; }; - MooseXDaemonize = buildPerlModule rec { - name = "MooseX-Daemonize-0.21"; + MooseXDaemonize = buildPerlModule { + pname = "MooseX-Daemonize"; + version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Daemonize-0.21.tar.gz; sha256 = "111f391221d00f8b09cdcc6c806ab114324cf7f529d12f627fb97d054da42225"; }; buildInputs = [ DevelCheckOS ModuleBuildTiny TestFatal ]; @@ -10686,7 +11492,8 @@ let }; MooseXEmulateClassAccessorFast = buildPerlPackage { - name = "MooseX-Emulate-Class-Accessor-Fast-0.009032"; + pname = "MooseX-Emulate-Class-Accessor-Fast"; + version = "0.009032"; src = fetchurl { url = mirror://cpan/authors/id/H/HA/HAARG/MooseX-Emulate-Class-Accessor-Fast-0.009032.tar.gz; sha256 = "153r30nggcyyx7ai15dbnba2h5145f8jdsh6wj54298d3zpvgvl2"; @@ -10699,10 +11506,11 @@ let }; }; - MooseXGetopt = buildPerlModule rec { - name = "MooseX-Getopt-0.74"; + MooseXGetopt = buildPerlModule { + pname = "MooseX-Getopt"; + version = "0.74"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Getopt-0.74.tar.gz; sha256 = "1de0df3b431ebe9f3563bdf4569eacd7e07e865a8397f2a990d0cb57d4cb2c24"; }; buildInputs = [ ModuleBuildTiny MooseXStrictConstructor PathTiny TestDeep TestFatal TestNeeds TestTrap TestWarnings ]; @@ -10715,7 +11523,8 @@ let }; MooseXHasOptions = buildPerlPackage { - name = "MooseX-Has-Options-0.003"; + pname = "MooseX-Has-Options"; + version = "0.003"; src = fetchurl { url = mirror://cpan/authors/id/P/PS/PSHANGOV/MooseX-Has-Options-0.003.tar.gz; sha256 = "07c21cf8ed500b272020ff8da19f194728bb414e0012a2f0cc54ef2ef6222a68"; @@ -10730,7 +11539,8 @@ let }; MooseXHasSugar = buildPerlPackage { - name = "MooseX-Has-Sugar-1.000006"; + pname = "MooseX-Has-Sugar"; + version = "1.000006"; src = fetchurl { url = mirror://cpan/authors/id/K/KE/KENTNL/MooseX-Has-Sugar-1.000006.tar.gz; sha256 = "efeed3ddb3a8ea18f416d485f3c2b0427145d267e63368c651d488eaa8c28d09"; @@ -10745,7 +11555,8 @@ let }; MooseXLazyRequire = buildPerlModule { - name = "MooseX-LazyRequire-0.11"; + pname = "MooseX-LazyRequire"; + version = "0.11"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-LazyRequire-0.11.tar.gz; sha256 = "ef620c1e019daf9cf3f23a943d25a94c91e93ab312bcd63be2e9740ec0b94288"; @@ -10760,7 +11571,8 @@ let }; MooseXMarkAsMethods = buildPerlPackage { - name = "MooseX-MarkAsMethods-0.15"; + pname = "MooseX-MarkAsMethods"; + version = "0.15"; src = fetchurl { url = mirror://cpan/authors/id/R/RS/RSRCHBOY/MooseX-MarkAsMethods-0.15.tar.gz; sha256 = "1y3yxwcjjajm66pvca54cv9fax7a6dy36xqr92x7vzyhfqrw3v69"; @@ -10773,7 +11585,8 @@ let }; MooseXMethodAttributes = buildPerlPackage { - name = "MooseX-MethodAttributes-0.31"; + pname = "MooseX-MethodAttributes"; + version = "0.31"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-MethodAttributes-0.31.tar.gz; sha256 = "1whd10w7bm3dwaj7gpgw40bci9vvb2zmxs4349ifji91hvinwqck"; @@ -10788,7 +11601,8 @@ let }; MooseXNonMoose = buildPerlPackage { - name = "MooseX-NonMoose-0.26"; + pname = "MooseX-NonMoose"; + version = "0.26"; src = fetchurl { url = mirror://cpan/authors/id/D/DO/DOY/MooseX-NonMoose-0.26.tar.gz; sha256 = "0zdaiphc45s5xj0ax5mkijf5d8v6w6yccb3zplgj6f30y7n55gnb"; @@ -10802,7 +11616,8 @@ let }; MooseXOneArgNew = buildPerlPackage { - name = "MooseX-OneArgNew-0.005"; + pname = "MooseX-OneArgNew"; + version = "0.005"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-OneArgNew-0.005.tar.gz; sha256 = "0gqhqdkwsnxmni0xv43iplplgp6g55khdwc5117j9i569r3wykvy"; @@ -10815,8 +11630,9 @@ let }; }; - MooseXRelatedClassRoles = buildPerlPackage rec { - name = "MooseX-RelatedClassRoles-0.004"; + MooseXRelatedClassRoles = buildPerlPackage { + pname = "MooseX-RelatedClassRoles"; + version = "0.004"; src = fetchurl { url = mirror://cpan/authors/id/H/HD/HDP/MooseX-RelatedClassRoles-0.004.tar.gz; sha256 = "17vynkf6m5d039qkr4in1c9lflr8hnwp1fgzdwhj4q6jglipmnrh"; @@ -10825,7 +11641,8 @@ let }; MooseXParamsValidate = buildPerlPackage { - name = "MooseX-Params-Validate-0.21"; + pname = "MooseX-Params-Validate"; + version = "0.21"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-Params-Validate-0.21.tar.gz; sha256 = "1n9ry6gnskkp9ir6s7d5jirn3mh14ydgpmwqz6wcp6d9md358ac8"; @@ -10839,7 +11656,8 @@ let }; MooseXRoleParameterized = buildPerlModule { - name = "MooseX-Role-Parameterized-1.10"; + pname = "MooseX-Role-Parameterized"; + version = "1.10"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-Parameterized-1.10.tar.gz; sha256 = "0plx25n80mv9qwhix52z79md0qil616nbcryk2f4216kghpw2ij8"; @@ -10853,10 +11671,11 @@ let }; }; - MooseXRoleWithOverloading = buildPerlPackage rec { - name = "MooseX-Role-WithOverloading-0.17"; + MooseXRoleWithOverloading = buildPerlPackage { + pname = "MooseX-Role-WithOverloading"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-WithOverloading-0.17.tar.gz; sha256 = "0rb8k0dp1a55bm2pr6r0vsi5msvjl1dslfidxp1gj80j7zbrbc4j"; }; propagatedBuildInputs = [ Moose aliased namespaceautoclean ]; @@ -10866,10 +11685,11 @@ let }; }; - MooseXRunnable = buildPerlModule rec { - name = "MooseX-Runnable-0.10"; + MooseXRunnable = buildPerlModule { + pname = "MooseX-Runnable"; + version = "0.10"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Runnable-0.10.tar.gz; sha256 = "40d8fd1b5524ae965965a1f144d7a0a0c850594c524402b2319b24d5c4af1199"; }; buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 TestTableDriven ]; @@ -10881,8 +11701,9 @@ let }; }; - MooseXSemiAffordanceAccessor = buildPerlPackage rec { - name = "MooseX-SemiAffordanceAccessor-0.10"; + MooseXSemiAffordanceAccessor = buildPerlPackage { + pname = "MooseX-SemiAffordanceAccessor"; + version = "0.10"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-SemiAffordanceAccessor-0.10.tar.gz; sha256 = "1mdil9ckgmgr78z59p8wfa35ixn5855ndzx14y01dvfxpiv5gf55"; @@ -10890,8 +11711,9 @@ let propagatedBuildInputs = [ Moose ]; }; - MooseXSetOnce = buildPerlPackage rec { - name = "MooseX-SetOnce-0.200002"; + MooseXSetOnce = buildPerlPackage { + pname = "MooseX-SetOnce"; + version = "0.200002"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-SetOnce-0.200002.tar.gz; sha256 = "0ndnl8dj7nh8lvckl6r3jw31d0dmq30qf2pqkgcz0lykzjvhdvfb"; @@ -10900,8 +11722,9 @@ let propagatedBuildInputs = [ Moose ]; }; - MooseXSingleton = buildPerlModule rec { - name = "MooseX-Singleton-0.30"; + MooseXSingleton = buildPerlModule { + pname = "MooseX-Singleton"; + version = "0.30"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Singleton-0.30.tar.gz; sha256 = "0hb5s1chsgbx2nlb0f112mdh2v1zwww8f4i3gvfvcghx3grv5135"; @@ -10911,7 +11734,8 @@ let }; MooseXStrictConstructor = buildPerlPackage { - name = "MooseX-StrictConstructor-0.21"; + pname = "MooseX-StrictConstructor"; + version = "0.21"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-StrictConstructor-0.21.tar.gz; sha256 = "c72a5ae9583706ccdec71d401dcb3054013a7536b750df1436613d858ea2920d"; @@ -10924,10 +11748,11 @@ let }; }; - MooseXTraits = buildPerlModule rec { - name = "MooseX-Traits-0.13"; + MooseXTraits = buildPerlModule { + pname = "MooseX-Traits"; + version = "0.13"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Traits-0.13.tar.gz; sha256 = "74afe0c4faf4e3b97c57f289437caa60becca34cd5821f489dd4cc9da4fbe29a"; }; buildInputs = [ ModuleBuildTiny MooseXRoleParameterized TestFatal TestRequires TestSimple13 ]; @@ -10939,20 +11764,22 @@ let }; }; - MooseXTraitsPluggable = buildPerlPackage rec { - name = "MooseX-Traits-Pluggable-0.12"; + MooseXTraitsPluggable = buildPerlPackage { + pname = "MooseX-Traits-Pluggable"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RK/RKITOVER/MooseX-Traits-Pluggable-0.12.tar.gz; sha256 = "1jjqmcidy4kdgp5yffqqwxrsab62mbhbpvnzdy1rpwnb1savg5mb"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ ListMoreUtils Moose namespaceautoclean ]; }; - MooseXTypes = buildPerlModule rec { - name = "MooseX-Types-0.50"; + MooseXTypes = buildPerlModule { + pname = "MooseX-Types"; + version = "0.50"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-0.50.tar.gz; sha256 = "9cd87b3492cbf0be9d2df9317b2adf9fc30663770e69906654bea3f41b17cb08"; }; buildInputs = [ ModuleBuildTiny TestFatal TestRequires ]; @@ -10964,10 +11791,11 @@ let }; }; - MooseXTypesCommon = buildPerlModule rec { - name = "MooseX-Types-Common-0.001014"; + MooseXTypesCommon = buildPerlModule { + pname = "MooseX-Types-Common"; + version = "0.001014"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Common-0.001014.tar.gz; sha256 = "ef93718b6d2f240d50b5c3acb1a74b4c2a191869651470001a82be1f35d0ef0f"; }; buildInputs = [ ModuleBuildTiny TestDeep TestWarnings ]; @@ -10979,10 +11807,11 @@ let }; }; - MooseXTypesDateTime = buildPerlModule rec { - name = "MooseX-Types-DateTime-0.13"; + MooseXTypesDateTime = buildPerlModule { + pname = "MooseX-Types-DateTime"; + version = "0.13"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-DateTime-0.13.tar.gz; sha256 = "b89fa26636f6a17eaa3868b4514340472b68bbdc2161a1d79a22a1bf5b1d39c6"; }; buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 ]; @@ -10994,10 +11823,11 @@ let }; }; - MooseXTypesDateTimeMoreCoercions = buildPerlModule rec { - name = "MooseX-Types-DateTime-MoreCoercions-0.15"; + MooseXTypesDateTimeMoreCoercions = buildPerlModule { + pname = "MooseX-Types-DateTime-MoreCoercions"; + version = "0.15"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-DateTime-MoreCoercions-0.15.tar.gz; sha256 = "21bb3a597719888edb6ceaa132418d5cf92ecb92a50cce37b94259a55e0e3796"; }; buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 ]; @@ -11010,7 +11840,8 @@ let }; MooseXTypesLoadableClass = buildPerlModule { - name = "MooseX-Types-LoadableClass-0.015"; + pname = "MooseX-Types-LoadableClass"; + version = "0.015"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-LoadableClass-0.015.tar.gz; sha256 = "e037d3778253dcf92946435715bada0e6449c0a2808fa3ff32a965064d5a3bf4"; @@ -11025,7 +11856,8 @@ let }; MooseXTypesPathClass = buildPerlModule { - name = "MooseX-Types-Path-Class-0.09"; + pname = "MooseX-Types-Path-Class"; + version = "0.09"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Class-0.09.tar.gz; sha256 = "0zpgwzxj6d9k2lbg6v6zd1bcbzjz2h336rm816krbblq6ssvm177"; @@ -11039,7 +11871,8 @@ let }; MooseXTypesPathTiny = buildPerlModule { - name = "MooseX-Types-Path-Tiny-0.012"; + pname = "MooseX-Types-Path-Tiny"; + version = "0.012"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Tiny-0.012.tar.gz; sha256 = "19eede02dd654e70f73e34cd7af0063765173bcaefeeff1bdbe21318ecfd9158"; @@ -11054,7 +11887,8 @@ let }; MooseXTypesPerl = buildPerlPackage { - name = "MooseX-Types-Perl-0.101343"; + pname = "MooseX-Types-Perl"; + version = "0.101343"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Types-Perl-0.101343.tar.gz; sha256 = "0nijy676q27bvjb8swxrb1j4lq2xq8jbqkaxs1l9q81k7jpvx17h"; @@ -11067,7 +11901,8 @@ let }; MooseXTypesStringlike = buildPerlPackage { - name = "MooseX-Types-Stringlike-0.003"; + pname = "MooseX-Types-Stringlike"; + version = "0.003"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DAGOLDEN/MooseX-Types-Stringlike-0.003.tar.gz; sha256 = "06fgamdiz0n7cgghb8ycjd5mcidj8w769zs2gws6z6jjbkn4kqrf"; @@ -11081,7 +11916,8 @@ let }; MooseXTypesStructured = buildPerlModule { - name = "MooseX-Types-Structured-0.36"; + pname = "MooseX-Types-Structured"; + version = "0.36"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Structured-0.36.tar.gz; sha256 = "0mrxc00sid7526c6brrnjr6288468sszic3wazij71v3z59bdka3"; @@ -11094,10 +11930,11 @@ let }; }; - MooseXTypesURI = buildPerlModule rec { - name = "MooseX-Types-URI-0.08"; + MooseXTypesURI = buildPerlModule { + pname = "MooseX-Types-URI"; + version = "0.08"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-URI-0.08.tar.gz; sha256 = "d310d20fa361fe2dff758236df87949cc7bf98e5cf3a7c79115365eccde6ccc1"; }; buildInputs = [ ModuleBuildTiny TestSimple13 ]; @@ -11109,8 +11946,9 @@ let }; }; - Mouse = buildPerlModule rec { - name = "Mouse-2.5.6"; + Mouse = buildPerlModule { + pname = "Mouse"; + version = "2.5.6"; src = fetchurl { url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.6.tar.gz; sha256 = "1j3048ip691j91rdig6wrlg6i4jdzhszxmz5pi2g7n355rl2w00l"; @@ -11121,10 +11959,11 @@ let hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector"; }; - MouseXNativeTraits = buildPerlPackage rec { - name = "MouseX-NativeTraits-1.09"; + MouseXNativeTraits = buildPerlPackage { + pname = "MouseX-NativeTraits"; + version = "1.09"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GF/GFUJI/MouseX-NativeTraits-1.09.tar.gz; sha256 = "0pnbchkxfz9fwa8sniyjqp0mz75b3k2fafq9r09znbbh51dbz9gq"; }; buildInputs = [ AnyMoose TestFatal ]; @@ -11135,10 +11974,11 @@ let }; }; - MozillaCA = buildPerlPackage rec { - name = "Mozilla-CA-20180117"; + MozillaCA = buildPerlPackage { + pname = "Mozilla-CA"; + version = "20180117"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AB/ABH/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20180117.tar.gz; sha256 = "f2cc9fbe119f756313f321e0d9f1fac0859f8f154ac9d75b1a264c1afdf4e406"; }; meta = { @@ -11148,7 +11988,7 @@ let }; MozillaLdap = buildPerlPackage rec { - name = "Mozilla-Ldap-${version}"; + pname = "Mozilla-Ldap"; version = "1.5.3"; USE_OPENLDAP = 1; LDAPSDKDIR = pkgs.openldap.dev; @@ -11164,7 +12004,8 @@ let }; MROCompat = buildPerlPackage { - name = "MRO-Compat-0.13"; + pname = "MRO-Compat"; + version = "0.13"; src = fetchurl { url = mirror://cpan/authors/id/H/HA/HAARG/MRO-Compat-0.13.tar.gz; sha256 = "1y547lr6zccf7919vx01v22zsajy528psanhg5aqschrrin3nb4a"; @@ -11175,10 +12016,11 @@ let }; }; - MusicBrainzDiscID = buildPerlModule rec { - name = "MusicBrainz-DiscID-0.03"; + MusicBrainzDiscID = buildPerlModule { + pname = "MusicBrainz-DiscID"; + version = "0.03"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NJ/NJH/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.03.tar.gz; sha256 = "0fjph2q3yp0aa87gckv3391s47m13wbyylj7jb7vqx7hv0pzj0jh"; }; # Build.PL in this package uses which to find pkg-config -- make it use path instead @@ -11188,20 +12030,22 @@ let propagatedBuildInputs = [ pkgs.libdiscid ]; }; - MusicBrainz = buildPerlModule rec { - name = "WebService-MusicBrainz-1.0.5"; + MusicBrainz = buildPerlModule { + pname = "WebService-MusicBrainz"; + version = "1.0.5"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BF/BFAIST/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BF/BFAIST/WebService-MusicBrainz-1.0.5.tar.gz; sha256 = "16chs1l58cf000d5kalkyph3p31ci73p1rlyx98mfv10d2cq6fsj"; }; propagatedBuildInputs = [ Mojolicious ]; doCheck = false; # Test performs network access. }; - namespaceautoclean = buildPerlPackage rec { - name = "namespace-autoclean-0.28"; + namespaceautoclean = buildPerlPackage { + pname = "namespace-autoclean"; + version = "0.28"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/namespace-autoclean-0.28.tar.gz; sha256 = "cd410a1681add521a28805da2e138d44f0d542407b50999252a147e553c26c39"; }; buildInputs = [ TestRequires ]; @@ -11213,10 +12057,11 @@ let }; }; - namespaceclean = buildPerlPackage rec { - name = "namespace-clean-0.27"; + namespaceclean = buildPerlPackage { + pname = "namespace-clean"; + version = "0.27"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RI/RIBASUSHI/namespace-clean-0.27.tar.gz; sha256 = "8a10a83c3e183dc78f9e7b7aa4d09b47c11fb4e7d3a33b9a12912fd22e31af9d"; }; propagatedBuildInputs = [ BHooksEndOfScope PackageStash ]; @@ -11226,10 +12071,11 @@ let }; }; - NetIdent = buildPerlPackage rec { - name = "Net-Ident-1.24"; + NetIdent = buildPerlPackage { + pname = "Net-Ident"; + version = "1.24"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TO/TODDR/Net-Ident-1.24.tar.gz; sha256 = "5f5f1142185a67b87406a3fb31f221564f61838a70ef4c07284a66c55e82ad05"; }; meta = { @@ -11239,10 +12085,11 @@ let }; }; - NetAddrIP = buildPerlPackage rec { - name = "NetAddr-IP-4.079"; + NetAddrIP = buildPerlPackage { + pname = "NetAddr-IP"; + version = "4.079"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIKER/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIKER/NetAddr-IP-4.079.tar.gz; sha256 = "ec5a82dfb7028bcd28bb3d569f95d87dd4166cc19867f2184ed3a59f6d6ca0e7"; }; meta = { @@ -11252,7 +12099,8 @@ let }; NetAmazonAWSSign = buildPerlPackage { - name = "Net-Amazon-AWSSign-0.12"; + pname = "Net-Amazon-AWSSign"; + version = "0.12"; src = fetchurl { url = mirror://cpan/authors/id/N/NA/NATON/Net-Amazon-AWSSign-0.12.tar.gz; sha256 = "0gpdjz5095hd3y1xhnbv45m6q2shw0c9r7spj1jvb8hy7dmhq10x"; @@ -11263,8 +12111,9 @@ let }; }; - NetAmazonEC2 = buildPerlPackage rec { - name = "Net-Amazon-EC2-0.14-stanaka-bc66577e13"; + NetAmazonEC2 = buildPerlPackage { + pname = "Net-Amazon-EC2"; + version = "0.14-stanaka-bc66577e13"; src = fetchFromGitHub { owner = "stanaka"; repo = "net-amazon-ec2"; @@ -11285,10 +12134,11 @@ let doCheck = false; # wants to create actual EC2 instances (for $$$) }; - NetAmazonMechanicalTurk = buildPerlModule rec { - name = "Net-Amazon-MechanicalTurk-1.02"; + NetAmazonMechanicalTurk = buildPerlModule { + pname = "Net-Amazon-MechanicalTurk"; + version = "1.02"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MT/MTURK/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MT/MTURK/Net-Amazon-MechanicalTurk-1.02.tar.gz; sha256 = "13hgggfchhp4m3l2rn3d1v6g6ccwmwf9xiyc9izv5570930mw2cd"; }; patches = @@ -11297,8 +12147,9 @@ let doCheck = false; /* wants network */ }; - NetAmazonS3 = buildPerlPackage rec { - name = "Net-Amazon-S3-0.86"; + NetAmazonS3 = buildPerlPackage { + pname = "Net-Amazon-S3"; + version = "0.86"; src = fetchurl { url = mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.86.tar.gz; sha256 = "6301e683a19b1302a234a1689d7c7f7e7102b3e86f4de428b8cc1cd975f0c38a"; @@ -11312,7 +12163,8 @@ let }; NetAmazonS3Policy = buildPerlModule { - name = "Net-Amazon-S3-Policy-0.1.6"; + pname = "Net-Amazon-S3-Policy"; + version = "0.1.6"; src = fetchurl { url = mirror://cpan/authors/id/P/PO/POLETTIX/Net-Amazon-S3-Policy-0.1.6.tar.gz; sha256 = "056rhq6vsdpwi2grbmxj8341qjrz0258civpnhs78j37129nxcfj"; @@ -11325,7 +12177,8 @@ let }; NetAMQP = buildPerlModule { - name = "Net-AMQP-0.06"; + pname = "Net-AMQP"; + version = "0.06"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHIPS/Net-AMQP-0.06.tar.gz; sha256 = "0b2ba7de2cd7ddd5fe102a2e2ae7aeba21eaab1078bf3bfd3c5a722937256380"; @@ -11340,7 +12193,8 @@ let }; NetCIDR = buildPerlPackage { - name = "Net-CIDR-0.20"; + pname = "Net-CIDR"; + version = "0.20"; src = fetchurl { url = mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.20.tar.gz; sha256 = "c75edc6818bb360d71c139169fd64ad65c35fff6d2b9fac7b9f9e6c467f187b5"; @@ -11352,10 +12206,11 @@ let }; }; - NetCIDRLite = buildPerlPackage rec { - name = "Net-CIDR-Lite-0.21"; + NetCIDRLite = buildPerlPackage { + pname = "Net-CIDR-Lite"; + version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOUGW/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DO/DOUGW/Net-CIDR-Lite-0.21.tar.gz; sha256 = "cfa125e8a2aef9259bc3a44e07cbdfb7894b64d22e7c0cee92aee2f5c7915093"; }; meta = { @@ -11364,7 +12219,8 @@ let }; NetCoverArtArchive = buildPerlPackage { - name = "Net-CoverArtArchive-1.02"; + pname = "Net-CoverArtArchive"; + version = "1.02"; src = fetchurl { url = mirror://cpan/authors/id/C/CY/CYCLES/Net-CoverArtArchive-1.02.tar.gz; sha256 = "1lfx8lrjgb3s11fcm243jp5sghngd9svkgmg7xmssmj34q4f49ap"; @@ -11378,10 +12234,11 @@ let }; }; - NetDBus = buildPerlPackage rec { - name = "Net-DBus-1.1.0"; + NetDBus = buildPerlPackage { + pname = "Net-DBus"; + version = "1.1.0"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DANBERR/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DA/DANBERR/Net-DBus-1.1.0.tar.gz; sha256 = "8391696db9e96c374b72984c0bad9c7d1c9f3b4efe68f9ddf429a77548e0e269"; }; nativeBuildInputs = [ pkgs.buildPackages.pkgconfig ]; @@ -11394,10 +12251,11 @@ let }; }; - NetDNS = buildPerlPackage rec { - name = "Net-DNS-1.20"; + NetDNS = buildPerlPackage { + pname = "Net-DNS"; + version = "1.20"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NL/NLNETLABS/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.20.tar.gz; sha256 = "7fd9692b687253baa8f2eb639f1dd7ff9c77fddd67167dc59b400bd25e4ce01b"; }; propagatedBuildInputs = [ DigestHMAC ]; @@ -11408,8 +12266,9 @@ let }; }; - NetDNSResolverMock = buildPerlPackage rec { - name = "Net-DNS-Resolver-Mock-1.20171219"; + NetDNSResolverMock = buildPerlPackage { + pname = "Net-DNS-Resolver-Mock"; + version = "1.20171219"; src = fetchurl { url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20171219.tar.gz; sha256 = "0m3rxpkv1b9121srvbqkrgzg4m8mnydiydqv34in1i1ixwrl6jn9"; @@ -11421,10 +12280,11 @@ let }; }; - NetDomainTLD = buildPerlPackage rec { - name = "Net-Domain-TLD-1.75"; + NetDomainTLD = buildPerlPackage { + pname = "Net-Domain-TLD"; + version = "1.75"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AL/ALEXP/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AL/ALEXP/Net-Domain-TLD-1.75.tar.gz; sha256 = "4c37f811184d68ac4179d48c10ea31922dd5fca2c1bffcdcd95c5a2a3b4002ee"; }; meta = { @@ -11433,8 +12293,9 @@ let }; }; - NetFastCGI = buildPerlPackage rec { - name = "Net-FastCGI-0.14"; + NetFastCGI = buildPerlPackage { + pname = "Net-FastCGI"; + version = "0.14"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHANSEN/Net-FastCGI-0.14.tar.gz; sha256 = "0sjrnlzci21sci5m52zz0x9bf889j67i6vnhrjlypsfm9w5914qi"; @@ -11446,10 +12307,11 @@ let }; }; - NetHTTP = buildPerlPackage rec { - name = "Net-HTTP-6.18"; + NetHTTP = buildPerlPackage { + pname = "Net-HTTP"; + version = "6.18"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/${name}.tar.gz"; + url = mirror://cpan/authors/id/O/OA/OALDERS/Net-HTTP-6.18.tar.gz; sha256 = "7e42df2db7adce3e0eb4f78b88c450f453f5380f120fd5411232e03374ba951c"; }; propagatedBuildInputs = [ URI ]; @@ -11463,7 +12325,8 @@ let }; NetIDNEncode = buildPerlModule { - name = "Net-IDN-Encode-2.500"; + pname = "Net-IDN-Encode"; + version = "2.500"; src = fetchurl { url = mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.500.tar.gz; sha256 = "1aiy7adirk3wpwlczd8sldi9k1dray0jrg1lbcrcw97zwcrkciam"; @@ -11474,10 +12337,11 @@ let }; }; - NetIMAPClient = buildPerlPackage rec { - name = "Net-IMAP-Client-0.9505"; + NetIMAPClient = buildPerlPackage { + pname = "Net-IMAP-Client"; + version = "0.9505"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GANGLION/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GA/GANGLION/Net-IMAP-Client-0.9505.tar.gz; sha256 = "d3f6a608b85e09a8080a67a9933837aae6f2cd0e8ee39df3380123dc5e3de912"; }; propagatedBuildInputs = [ IOSocketSSL ListMoreUtils ]; @@ -11487,7 +12351,8 @@ let }; NetIP = buildPerlPackage { - name = "Net-IP-1.26"; + pname = "Net-IP"; + version = "1.26"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MANU/Net-IP-1.26.tar.gz; sha256 = "0ffn2xqqbkfi7v303sp5dwgbv36jah3vg8r4nxhxfiv60vric3q4"; @@ -11497,10 +12362,11 @@ let }; }; - NetNetmask = buildPerlPackage rec { - name = "Net-Netmask-1.9104"; + NetNetmask = buildPerlPackage { + pname = "Net-Netmask"; + version = "1.9104"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JM/JMASLAK/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JM/JMASLAK/Net-Netmask-1.9104.tar.gz; sha256 = "17li2svymz49az35xl6galp4b9qcnb985gzklhikkvkn9da6rz3y"; }; buildInputs = [ Test2Suite TestUseAllModules ]; @@ -11510,7 +12376,8 @@ let }; NetOAuth = buildPerlModule { - name = "Net-OAuth-0.28"; + pname = "Net-OAuth"; + version = "0.28"; src = fetchurl { url = mirror://cpan/authors/id/K/KG/KGRENNAN/Net-OAuth-0.28.tar.gz; sha256 = "0k4h4a5048h7qgyx25ih64x0l4airx8a6d9gjq08wmxcl2fk3z3v"; @@ -11523,17 +12390,19 @@ let }; }; - NetPatricia = buildPerlPackage rec { - name = "Net-Patricia-1.22"; + NetPatricia = buildPerlPackage { + pname = "Net-Patricia"; + version = "1.22"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GR/GRUBER/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GR/GRUBER/Net-Patricia-1.22.tar.gz; sha256 = "70835a926e1c5a8d0324c72fffee82eeb7ec6c141dee04fd446820b64f71c552"; }; propagatedBuildInputs = [ NetCIDRLite Socket6 ]; }; NetPing = buildPerlPackage { - name = "Net-Ping-2.72"; + pname = "Net-Ping"; + version = "2.72"; src = fetchurl { url = mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.72.tar.gz; sha256 = "555af602f54229cd81fef7da1a81516800f3155c6dc4d07dc71be1de3253dd6a"; @@ -11543,8 +12412,9 @@ let }; }; - NetDNSResolverProgrammable = buildPerlPackage rec { - name = "Net-DNS-Resolver-Programmable-0.009"; + NetDNSResolverProgrammable = buildPerlPackage { + pname = "Net-DNS-Resolver-Programmable"; + version = "0.009"; src = fetchurl { url = mirror://cpan/authors/id/B/BI/BIGPRESH/Net-DNS-Resolver-Programmable-0.009.tar.gz; sha256 = "8080a2ab776629585911af1179bdb7c4dc2bebfd4b5efd77b11d1dac62454bf8"; @@ -11556,10 +12426,11 @@ let }; }; - NetSCP = buildPerlPackage rec { - name = "Net-SCP-0.08.reprise"; + NetSCP = buildPerlPackage { + pname = "Net-SCP"; + version = "0.08.reprise"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IV/IVAN/${name}.tar.gz"; + url = mirror://cpan/authors/id/I/IV/IVAN/Net-SCP-0.08.reprise.tar.gz; sha256 = "88a9b2df69e769e5855a408b19f61915b82e8fe070ab5cf4d525dd3b8bbe31c1"; }; propagatedBuildInputs = [ pkgs.openssl ]; @@ -11574,7 +12445,8 @@ let }; NetServer = buildPerlPackage { - name = "Net-Server-2.009"; + pname = "Net-Server"; + version = "2.009"; src = fetchurl { url = mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.009.tar.gz; sha256 = "0gw1k9gcw7habbkxvsfa2gz34brlbwcidk6khgsf1qjm0dbccrw2"; @@ -11585,10 +12457,11 @@ let }; }; - NetSFTPForeign = buildPerlPackage rec { - name = "Net-SFTP-Foreign-1.90"; + NetSFTPForeign = buildPerlPackage { + pname = "Net-SFTP-Foreign"; + version = "1.90"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SA/SALVA/Net-SFTP-Foreign-1.90.tar.gz; sha256 = "d1eafb34f669ab6de675058292778ba2e0e42ecafd59abb1128ba31d62a0419d"; }; propagatedBuildInputs = [ pkgs.openssl ]; @@ -11601,8 +12474,9 @@ let }; }; - NetServerCoro = buildPerlPackage rec { - name = "Net-Server-Coro-1.3"; + NetServerCoro = buildPerlPackage { + pname = "Net-Server-Coro"; + version = "1.3"; src = fetchurl { url = mirror://cpan/authors/id/A/AL/ALEXMV/Net-Server-Coro-1.3.tar.gz; sha256 = "11pvfxsi0q37kd17z597wb8r9dv3r96fiagq57kc746k1lmp06hy"; @@ -11615,7 +12489,8 @@ let }; NetSMTPSSL = buildPerlPackage { - name = "Net-SMTP-SSL-1.04"; + pname = "Net-SMTP-SSL"; + version = "1.04"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.04.tar.gz; sha256 = "001a6dcfahf7kkyirqkc8jd4fh4fkal7n7vm9c4dblqrvmdc8abv"; @@ -11624,7 +12499,8 @@ let }; NetSMTPTLS = buildPerlPackage { - name = "Net-SMTP-TLS-0.12"; + pname = "Net-SMTP-TLS"; + version = "0.12"; src = fetchurl { url = mirror://cpan/authors/id/A/AW/AWESTHOLM/Net-SMTP-TLS-0.12.tar.gz; sha256 = "19g48kabj22v66jbf69q78xplhi7r1y2kdbddfwh4xy3g9k75rzg"; @@ -11633,7 +12509,8 @@ let }; NetSMTPTLSButMaintained = buildPerlPackage { - name = "Net-SMTP-TLS-ButMaintained-0.24"; + pname = "Net-SMTP-TLS-ButMaintained"; + version = "0.24"; src = fetchurl { url = mirror://cpan/authors/id/F/FA/FAYLAND/Net-SMTP-TLS-ButMaintained-0.24.tar.gz; sha256 = "0vi5cv7f9i96hgp3q3jpxzn1ysn802kh5xc304f8b7apf67w15bb"; @@ -11641,8 +12518,9 @@ let propagatedBuildInputs = [ DigestHMAC IOSocketSSL ]; }; - NetSNMP = buildPerlModule rec { - name = "Net-SNMP-6.0.1"; + NetSNMP = buildPerlModule { + pname = "Net-SNMP"; + version = "6.0.1"; src = fetchurl { url = "mirror://cpan/authors/id/D/DT/DTOWN/Net-SNMP-v6.0.1.tar.gz"; sha256 = "0hdpn1cw52x8cw24m9ayzpf4rwarm0khygn1sv3wvwxkrg0pphql"; @@ -11650,10 +12528,11 @@ let doCheck = false; # The test suite fails, see https://rt.cpan.org/Public/Bug/Display.html?id=85799 }; - NetSSH = buildPerlPackage rec { - name = "Net-SSH-0.09"; + NetSSH = buildPerlPackage { + pname = "Net-SSH"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IV/IVAN/${name}.tar.gz"; + url = mirror://cpan/authors/id/I/IV/IVAN/Net-SSH-0.09.tar.gz; sha256 = "7c71c7c3cbe953234dfe25bcc1ad7edb0e1f5a0578601f5523bc6070262a3817"; }; propagatedBuildInputs = [ pkgs.openssl ]; @@ -11666,8 +12545,9 @@ let }; }; - NetSSHPerl = buildPerlPackage rec { - name = "Net-SSH-Perl-2.14"; + NetSSHPerl = buildPerlPackage { + pname = "Net-SSH-Perl"; + version = "2.14"; src = fetchurl { url = mirror://cpan/authors/id/S/SC/SCHWIGON/Net-SSH-Perl-2.14.tar.gz; sha256 = "2b5d1bb13590b5870116704e7f1dce9a9823c4f80ff5461b97bb26a317393017"; @@ -11680,10 +12560,11 @@ let }; }; - NetSSLeay = buildPerlPackage rec { - name = "Net-SSLeay-1.85"; + NetSSLeay = buildPerlPackage { + pname = "Net-SSLeay"; + version = "1.85"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIKEM/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIKEM/Net-SSLeay-1.85.tar.gz; sha256 = "1j5h4ycm8538397l204d2d5fkm9595aj174pj7bkpbhwzfwqi0cx"; }; buildInputs = [ pkgs.openssl ]; @@ -11702,7 +12583,8 @@ let }; NetStatsd = buildPerlPackage { - name = "Net-Statsd-0.12"; + pname = "Net-Statsd"; + version = "0.12"; src = fetchurl { url = mirror://cpan/authors/id/C/CO/COSIMO/Net-Statsd-0.12.tar.gz; sha256 = "63e453603da165bc6d1c4ca0b55eda3d2204f040c59304a47782c5aa7886565c"; @@ -11714,7 +12596,8 @@ let }; NetTelnet = buildPerlPackage { - name = "Net-Telnet-3.04"; + pname = "Net-Telnet"; + version = "3.04"; src = fetchurl { url = mirror://cpan/authors/id/J/JR/JROGERS/Net-Telnet-3.04.tar.gz; sha256 = "e64d567a4e16295ecba949368e7a6b8b5ae2a16b3ad682121d9b007dc5d2a37a"; @@ -11726,7 +12609,8 @@ let }; NetTwitterLite = buildPerlModule { - name = "Net-Twitter-Lite-0.12008"; + pname = "Net-Twitter-Lite"; + version = "0.12008"; src = fetchurl { url = mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-Lite-0.12008.tar.gz; sha256 = "13j69a6nqq8mh5b4qk021db55rkfnk1ppwk0rpg68b1z58gvxsmj"; @@ -11741,10 +12625,11 @@ let }; }; - NetWhoisIP = buildPerlPackage rec { - name = "Net-Whois-IP-1.19"; + NetWhoisIP = buildPerlPackage { + pname = "Net-Whois-IP"; + version = "1.19"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BS/BSCHMITZ/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BS/BSCHMITZ/Net-Whois-IP-1.19.tar.gz; sha256 = "08kj2h9qiyfvv3jfz619xl796j93cslg7d96919mnrnjy6hdz6zh"; }; @@ -11758,7 +12643,8 @@ let }; NetWorks = buildPerlPackage { - name = "Net-Works-0.22"; + pname = "Net-Works"; + version = "0.22"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MAXMIND/Net-Works-0.22.tar.gz; sha256 = "1zz91vn1kdxljnlwllf4dzdsm4v6pja5694vf8l4w66azcyv5j8a"; @@ -11771,26 +12657,29 @@ let }; }; - NumberBytesHuman = buildPerlPackage rec { - name = "Number-Bytes-Human-0.11"; + NumberBytesHuman = buildPerlPackage { + pname = "Number-Bytes-Human"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FE/FERREIRA/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FE/FERREIRA/Number-Bytes-Human-0.11.tar.gz; sha256 = "0b3gprpbcrdwc2gqalpys5m2ngilh5injhww8y0gf3dln14rrisz"; }; }; - NumberCompare = buildPerlPackage rec { - name = "Number-Compare-0.03"; + NumberCompare = buildPerlPackage { + pname = "Number-Compare"; + version = "0.03"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RC/RCLAMP/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RC/RCLAMP/Number-Compare-0.03.tar.gz; sha256 = "09q8i0mxvr7q9vajwlgawsi0hlpc119gnhq4hc933d03x0vkfac3"; }; }; - NumberFormat = buildPerlPackage rec { - name = "Number-Format-1.75"; + NumberFormat = buildPerlPackage { + pname = "Number-Format"; + version = "1.75"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WR/WRW/${name}.tar.gz"; + url = mirror://cpan/authors/id/W/WR/WRW/Number-Format-1.75.tar.gz; sha256 = "82d659cb16461764fd44d11a9ce9e6a4f5e8767dc1069eb03467c6e55de257f3"; }; meta = { @@ -11799,8 +12688,9 @@ let }; }; - NumberMisc = buildPerlModule rec { - name = "Number-Misc-1.2"; + NumberMisc = buildPerlModule { + pname = "Number-Misc"; + version = "1.2"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIKO/Number-Misc-1.2.tar.gz; sha256 = "1n4ivj4ydplanwbxn3jbsfyfcl91ngn2d0addzqrq1hac26bdfbp"; @@ -11812,7 +12702,8 @@ let }; NumberWithError = buildPerlPackage { - name = "Number-WithError-1.01"; + pname = "Number-WithError"; + version = "1.01"; src = fetchurl { url = mirror://cpan/authors/id/S/SM/SMUELLER/Number-WithError-1.01.tar.gz; sha256 = "0m7my372rcj2d3j8xvhqdlhnnvxqabasvpvvhdkyli3qgrra1xnz"; @@ -11825,10 +12716,11 @@ let }; }; - NTLM = buildPerlPackage rec { - name = "NTLM-1.09"; + NTLM = buildPerlPackage { + pname = "NTLM"; + version = "1.09"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NB/NBEBOUT/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NB/NBEBOUT/NTLM-1.09.tar.gz; sha256 = "c823e30cda76bc15636e584302c960e2b5eeef9517c2448f7454498893151f85"; }; propagatedBuildInputs = [ DigestHMAC ]; @@ -11839,7 +12731,8 @@ let }; ObjectAccessor = buildPerlPackage { - name = "Object-Accessor-0.48"; + pname = "Object-Accessor"; + version = "0.48"; src = fetchurl { url = mirror://cpan/authors/id/B/BI/BINGOS/Object-Accessor-0.48.tar.gz; sha256 = "76cb824a27b6b4e560409fcf6fd5b3bfbbd38b72f1f3d37ed0b54bd9c0baeade"; @@ -11851,7 +12744,8 @@ let }; ObjectInsideOut = buildPerlModule { - name = "Object-InsideOut-4.05"; + pname = "Object-InsideOut"; + version = "4.05"; src = fetchurl { url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Object-InsideOut-4.05.tar.gz; sha256 = "1i6aif37ji91nsyncp5d0d3q29clf009sxdn1rz38917hai6rzcx"; @@ -11864,7 +12758,8 @@ let }; ObjectSignature = buildPerlPackage { - name = "Object-Signature-1.08"; + pname = "Object-Signature"; + version = "1.08"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Object-Signature-1.08.tar.gz; sha256 = "12k90c19ly93ib1p6sm3k7sbnr2h5dbywkdmnff2ngm99p4m68c4"; @@ -11875,10 +12770,11 @@ let }; }; - OLEStorage_Lite = buildPerlPackage rec { - name = "OLE-Storage_Lite-0.19"; + OLEStorage_Lite = buildPerlPackage { + pname = "OLE-Storage_Lite"; + version = "0.19"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JM/JMCNAMARA/OLE-Storage_Lite-0.19.tar.gz; sha256 = "179cxwqxb0f9dpx8954nvwjmggxxi5ndnang41yav1dx6mf0abp7"; }; meta = { @@ -11888,7 +12784,8 @@ let }; Opcodes = buildPerlPackage { - name = "Opcodes-0.14"; + pname = "Opcodes"; + version = "0.14"; src = fetchurl { url = mirror://cpan/authors/id/R/RU/RURBAN/Opcodes-0.14.tar.gz; sha256 = "7f7365447e4d1c5b87b43091448f0488e67c9f036b26c022a5409cd73d343893"; @@ -11900,14 +12797,15 @@ let }; OpenGL = buildPerlPackage rec { - name = "OpenGL-0.70"; + pname = "OpenGL"; + version = "0.70"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHM/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CH/CHM/OpenGL-0.70.tar.gz; sha256 = "1q3lz168q081iwl9jg21fbzhp9la79gav9mv6nmh2jab83s2l3mj"; }; # FIXME: try with libGL + libGLU instead of libGLU_combined - buildInputs = with pkgs; [ pkgs.libGLU_combined pkgs.libGLU pkgs.freeglut pkgs.xorg.libX11 pkgs.xorg.libXi pkgs.xorg.libXmu pkgs.xorg.libXext pkgs.xdummy ]; + buildInputs = [ pkgs.libGLU_combined pkgs.libGLU pkgs.freeglut pkgs.xorg.libX11 pkgs.xorg.libXi pkgs.xorg.libXmu pkgs.xorg.libXext pkgs.xdummy ]; patches = [ ../development/perl-modules/perl-opengl.patch ]; @@ -11923,29 +12821,32 @@ let doCheck = false; }; - NetOpenIDCommon = buildPerlPackage rec { - name = "Net-OpenID-Common-1.20"; + NetOpenIDCommon = buildPerlPackage { + pname = "Net-OpenID-Common"; + version = "1.20"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz"; + url = mirror://cpan/authors/id/W/WR/WROG/Net-OpenID-Common-1.20.tar.gz; sha256 = "1jdbkp18ka2m4akjp9b0dbw2lqnzgwpq435cnh6hwwa79bbrfkmb"; }; propagatedBuildInputs = [ CryptDHGMP XMLSimple ]; }; - NetOpenIDConsumer = buildPerlPackage rec { - name = "Net-OpenID-Consumer-1.18"; + NetOpenIDConsumer = buildPerlPackage { + pname = "Net-OpenID-Consumer"; + version = "1.18"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz"; + url = mirror://cpan/authors/id/W/WR/WROG/Net-OpenID-Consumer-1.18.tar.gz; sha256 = "0f2g6sczvbpyjmy14pabmrj0d48hlsndqswrvmqk1161wxpkh70f"; }; propagatedBuildInputs = [ JSON NetOpenIDCommon ]; buildInputs = [ CGI ]; }; - NetOpenSSH = buildPerlPackage rec { - name = "Net-OpenSSH-0.78"; + NetOpenSSH = buildPerlPackage { + pname = "Net-OpenSSH"; + version = "0.78"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.78.tar.gz; sha256 = "8f10844542a2824389decdb8edec7561d8199dc5f0250e849a0bb56f7aee880c"; }; meta = { @@ -11954,10 +12855,11 @@ let }; }; - NetZooKeeper = buildPerlPackage rec { - name = "Net-ZooKeeper-0.41"; + NetZooKeeper = buildPerlPackage { + pname = "Net-ZooKeeper"; + version = "0.41"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MAF/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MAF/Net-ZooKeeper-0.41.tar.gz; sha256 = "91c177f30f82302eaf3173356eef05c21bc82163df752acb469177bd14a72db9"; }; buildInputs = [ pkgs.zookeeper_mt ]; @@ -11973,7 +12875,8 @@ let }; PackageConstants = buildPerlPackage { - name = "Package-Constants-0.06"; + pname = "Package-Constants"; + version = "0.06"; src = fetchurl { url = mirror://cpan/authors/id/B/BI/BINGOS/Package-Constants-0.06.tar.gz; sha256 = "0b58be78706ccc4e4bd9bbad41767470427fd7b2cfad749489de101f85bc5df5"; @@ -11984,10 +12887,11 @@ let }; }; - PackageDeprecationManager = buildPerlPackage rec { - name = "Package-DeprecationManager-0.17"; + PackageDeprecationManager = buildPerlPackage { + pname = "Package-DeprecationManager"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.17.tar.gz; sha256 = "1d743ada482b5c9871d894966e87d4c20edc96931bb949fb2638b000ddd6684b"; }; buildInputs = [ TestFatal TestWarnings ]; @@ -11998,8 +12902,9 @@ let }; }; - PatchReader = buildPerlPackage rec { - name = "PatchReader-0.9.6"; + PatchReader = buildPerlPackage { + pname = "PatchReader"; + version = "0.9.6"; src = fetchurl { url = mirror://cpan/authors/id/T/TM/TMANNERM/PatchReader-0.9.6.tar.gz; sha256 = "b8de37460347bb5474dc01916ccb31dd2fe0cd92242c4a32d730e8eb087c323c"; @@ -12011,7 +12916,8 @@ let }; PackageStash = buildPerlPackage { - name = "Package-Stash-0.38"; + pname = "Package-Stash"; + version = "0.38"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.38.tar.gz; sha256 = "c58ee8844df2dda38e3bf66fdf443439aaefaef1a33940edf2055f0afd223a7f"; @@ -12025,7 +12931,8 @@ let }; PackageStashXS = buildPerlPackage { - name = "Package-Stash-XS-0.29"; + pname = "Package-Stash-XS"; + version = "0.29"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-XS-0.29.tar.gz; sha256 = "1akqk10qxwk798qppajqbczwmhy4cs9g0lg961m3vq218slnnryk"; @@ -12037,10 +12944,11 @@ let }; }; - Pango = buildPerlPackage rec { - name = "Pango-1.227"; + Pango = buildPerlPackage { + pname = "Pango"; + version = "1.227"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + url = mirror://cpan/authors/id/X/XA/XAOC/Pango-1.227.tar.gz; sha256 = "0wdcidnfnb6nm79fzfs39ivawj3x8m98a147fmcxgv1zvwia9c1l"; }; buildInputs = [ pkgs.pango ]; @@ -12052,10 +12960,11 @@ let }; }; - ParallelForkManager = buildPerlPackage rec { - name = "Parallel-ForkManager-2.02"; + ParallelForkManager = buildPerlPackage { + pname = "Parallel-ForkManager"; + version = "2.02"; src = fetchurl { - url = "mirror://cpan/authors/id/Y/YA/YANICK/${name}.tar.gz"; + url = mirror://cpan/authors/id/Y/YA/YANICK/Parallel-ForkManager-2.02.tar.gz; sha256 = "c1b2970a8bb666c3de7caac4a8f4dbcc043ab819bbc337692ec7bf27adae4404"; }; buildInputs = [ TestWarn ]; @@ -12068,7 +12977,8 @@ let }; ParallelPrefork = buildPerlPackage { - name = "Parallel-Prefork-0.18"; + pname = "Parallel-Prefork"; + version = "0.18"; src = fetchurl { url = mirror://cpan/authors/id/K/KA/KAZUHO/Parallel-Prefork-0.18.tar.gz; sha256 = "f1c1f48f1ae147a58bc88f9cb2f570d6bb15ea4c0d589abd4c3084ddc961596e"; @@ -12081,8 +12991,9 @@ let }; }; - ParamsClassify = buildPerlModule rec { - name = "Params-Classify-0.015"; + ParamsClassify = buildPerlModule { + pname = "Params-Classify"; + version = "0.015"; src = fetchurl { url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.015.tar.gz; sha256 = "052r198xyrsv8wz21gijdigz2cgnidsa37nvyfzdiz4rv1fc33ir"; @@ -12090,7 +13001,8 @@ let }; ParamsUtil = buildPerlPackage { - name = "Params-Util-1.07"; + pname = "Params-Util"; + version = "1.07"; src = fetchurl { url = mirror://cpan/authors/id/A/AD/ADAMK/Params-Util-1.07.tar.gz; sha256 = "0v67sx93yhn7xa0nh9mnbf8mixf54czk6wzrjsp6dzzr5hzyrw9h"; @@ -12101,10 +13013,11 @@ let }; }; - ParamsValidate = buildPerlModule rec { - name = "Params-Validate-1.29"; + ParamsValidate = buildPerlModule { + pname = "Params-Validate"; + version = "1.29"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.29.tar.gz; sha256 = "49a68dfb430bea028042479111d19068e08095e5a467e320b7ab7bde3d729733"; }; buildInputs = [ TestFatal TestRequires ]; @@ -12116,8 +13029,9 @@ let }; }; - ParamsValidationCompiler = buildPerlPackage rec { - name = "Params-ValidationCompiler-0.30"; + ParamsValidationCompiler = buildPerlPackage { + pname = "Params-ValidationCompiler"; + version = "0.30"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.30.tar.gz; sha256 = "1jqn1l4m4i341g14kmjsf3a1kn7vv6z89cix0xjjgr1v70iywnyw"; @@ -12130,10 +13044,11 @@ let }; }; - Paranoid = buildPerlPackage rec { - name = "Paranoid-2.07"; + Paranoid = buildPerlPackage { + pname = "Paranoid"; + version = "2.07"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CO/CORLISS/Paranoid/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CO/CORLISS/Paranoid/Paranoid-2.07.tar.gz; sha256 = "b55cfd8c6d5f181e218efd012f711a50cd14e4dbc8804650b95477178f43b7fc"; }; patches = [ ../development/perl-modules/Paranoid-blessed-path.patch ]; @@ -12150,7 +13065,8 @@ let }; PARDist = buildPerlPackage { - name = "PAR-Dist-0.49"; + pname = "PAR-Dist"; + version = "0.49"; src = fetchurl { url = mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-Dist-0.49.tar.gz; sha256 = "078ycyn8pw3rba4k3qwcqrqfcym5c1pivymwa0bvs9sab45j4iwy"; @@ -12160,8 +13076,9 @@ let }; }; - PAUSEPermissions = buildPerlPackage rec { - name = "PAUSE-Permissions-0.17"; + PAUSEPermissions = buildPerlPackage { + pname = "PAUSE-Permissions"; + version = "0.17"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEILB/PAUSE-Permissions-0.17.tar.gz; sha256 = "021ink414w4mdk6rd54cc1f23kfqg0zk4njx4ngr0bw3wc6r4kks"; @@ -12176,17 +13093,19 @@ let }; Parent = buildPerlPackage { - name = "parent-0.237"; + pname = "parent"; + version = "0.237"; src = fetchurl { url = mirror://cpan/authors/id/C/CO/CORION/parent-0.237.tar.gz; sha256 = "1bnaadzf51g6zrpq6pvvgds2cc9d4w1vck7sapkd3hb5hmjdk28h"; }; }; - ParseDebControl = buildPerlPackage rec { - name = "Parse-DebControl-2.005"; + ParseDebControl = buildPerlPackage { + pname = "Parse-DebControl"; + version = "2.005"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JA/JAYBONCI/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JA/JAYBONCI/Parse-DebControl-2.005.tar.gz; sha256 = "0ad78qri4sg9agghqdm83xsjgks94yvffs23kppy7mqjy8gwwjxn"; }; propagatedBuildInputs = [ IOStringy LWP ]; @@ -12195,8 +13114,9 @@ let }; }; - ParseLocalDistribution = buildPerlPackage rec { - name = "Parse-LocalDistribution-0.19"; + ParseLocalDistribution = buildPerlPackage { + pname = "Parse-LocalDistribution"; + version = "0.19"; src = fetchurl { url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-LocalDistribution-0.19.tar.gz; sha256 = "17p92nj4k3acrqqjnln1j5x8hbra9jkx5hdcybrq37ld9qnc62vb"; @@ -12209,10 +13129,11 @@ let }; }; - ParsePlainConfig = buildPerlPackage rec { - name = "Parse-PlainConfig-3.05"; + ParsePlainConfig = buildPerlPackage { + pname = "Parse-PlainConfig"; + version = "3.05"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CO/CORLISS/Parse-PlainConfig/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CO/CORLISS/Parse-PlainConfig/Parse-PlainConfig-3.05.tar.gz; sha256 = "6b78a8552398b0d2d7063505c93b3cfed0432c5b2cf6e00b8e51febf411c1efa"; }; propagatedBuildInputs = [ ClassEHierarchy Paranoid ]; @@ -12223,8 +13144,9 @@ let }; }; - ParsePMFile = buildPerlPackage rec { - name = "Parse-PMFile-0.41"; + ParsePMFile = buildPerlPackage { + pname = "Parse-PMFile"; + version = "0.41"; src = fetchurl { url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-PMFile-0.41.tar.gz; sha256 = "1ffv9msp4xjfaylay2zfqangxhgyr5xk993k5n1k08hh6qagq8df"; @@ -12236,10 +13158,11 @@ let }; }; - ParseRecDescent = buildPerlModule rec { - name = "Parse-RecDescent-1.967015"; + ParseRecDescent = buildPerlModule { + pname = "Parse-RecDescent"; + version = "1.967015"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JT/JTBRAUN/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JT/JTBRAUN/Parse-RecDescent-1.967015.tar.gz; sha256 = "1943336a4cb54f1788a733f0827c0c55db4310d5eae15e542639c9dd85656e37"; }; meta = { @@ -12249,7 +13172,8 @@ let }; ParseSyslog = buildPerlPackage { - name = "Parse-Syslog-1.10"; + pname = "Parse-Syslog"; + version = "1.10"; src = fetchurl { url = mirror://cpan/authors/id/D/DS/DSCHWEI/Parse-Syslog-1.10.tar.gz; sha256 = "659a2145441ef36d9835decaf83da308fcd03f49138cb3d90928e8bfc9f139d9"; @@ -12257,7 +13181,8 @@ let }; PathClass = buildPerlModule { - name = "Path-Class-0.37"; + pname = "Path-Class"; + version = "0.37"; src = fetchurl { url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.37.tar.gz; sha256 = "1kj8q8dmd8jci94w5arav59nkp0pkxrkliz4n8n6yf02hsa82iv5"; @@ -12269,7 +13194,8 @@ let }; PathTiny = buildPerlPackage { - name = "Path-Tiny-0.108"; + pname = "Path-Tiny"; + version = "0.108"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.108.tar.gz; sha256 = "3c49482be2b3eb7ddd7e73a5b90cff648393f5d5de334ff126ce7a3632723ff5"; @@ -12289,7 +13215,8 @@ let }; PathTools = buildPerlPackage { - name = "PathTools-3.75"; + pname = "PathTools"; + version = "3.75"; preConfigure = '' substituteInPlace Cwd.pm --replace '/usr/bin/pwd' '${pkgs.coreutils}/bin/pwd' ''; @@ -12300,7 +13227,8 @@ let }; pcscperl = buildPerlPackage { - name = "pcsc-perl-1.4.14"; + pname = "pcsc-perl"; + version = "1.4.14"; src = fetchurl { url = "mirror://cpan/authors/id/W/WH/WHOM/pcsc-perl-1.4.14.tar.bz2"; sha256 = "17f6i16jv6ci6459vh6y3sz94vgcvykjjszcl4xsykryakjvf8i7"; @@ -12318,10 +13246,11 @@ let }; }; - PDFAPI2 = buildPerlPackage rec { - name = "PDF-API2-2.033"; + PDFAPI2 = buildPerlPackage { + pname = "PDF-API2"; + version = "2.033"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SS/SSIMMS/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.033.tar.gz; sha256 = "9c0866ec1a3053f73afaca5f5cdbe6925903b4ce606f4bf4ac317731a69d27a0"; }; buildInputs = [ TestException TestMemoryCycle ]; @@ -12332,10 +13261,11 @@ let }; }; - Pegex = buildPerlPackage rec { - name = "Pegex-0.70"; + Pegex = buildPerlPackage { + pname = "Pegex"; + version = "0.70"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; + url = mirror://cpan/authors/id/I/IN/INGY/Pegex-0.70.tar.gz; sha256 = "fd3521321026048f493a88d43ce4b8e054f5d7acfec6a1db32fcaabe4dfda0fd"; }; buildInputs = [ FileShareDirInstall YAMLLibYAML ]; @@ -12346,8 +13276,9 @@ let }; }; - PerconaToolkit = buildPerlPackage rec { - name = "Percona-Toolkit-3.0.12"; + PerconaToolkit = buildPerlPackage { + pname = "Percona-Toolkit"; + version = "3.0.12"; src = fetchFromGitHub { owner = "percona"; repo = "percona-toolkit"; @@ -12364,18 +13295,20 @@ let }; }; - Perl5lib = buildPerlPackage rec { - name = "perl5lib-1.02"; + Perl5lib = buildPerlPackage { + pname = "perl5lib"; + version = "1.02"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NO/NOBULL/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NO/NOBULL/perl5lib-1.02.tar.gz; sha256 = "1b6fgs8wy2a7ff8rr1qdvdghhvlpr1pv760k4i2c8lq1hhjnkf94"; }; }; - Perlosnames = buildPerlPackage rec { - name = "Perl-osnames-0.11"; + Perlosnames = buildPerlPackage { + pname = "Perl-osnames"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PERLANCAR/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PE/PERLANCAR/Perl-osnames-0.11.tar.gz; sha256 = "fb22a1ed59dc2311f7f1ffca5685d90c0600020467f624f57b4dd3dba5bc659b"; }; meta = { @@ -12384,10 +13317,11 @@ let }; }; - PerlCritic = buildPerlModule rec { - name = "Perl-Critic-1.132"; + PerlCritic = buildPerlModule { + pname = "Perl-Critic"; + version = "1.132"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.132.tar.gz; sha256 = "bcf36e32830373cf1ee35abbe2e20336fbbcad5041c14aad6822ac947be092b1"; }; buildInputs = [ TestDeep ]; @@ -12399,18 +13333,20 @@ let }; }; - PerlIOeol = buildPerlPackage rec { - name = "PerlIO-eol-0.17"; + PerlIOeol = buildPerlPackage { + pname = "PerlIO-eol"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/PerlIO-eol-0.17.tar.gz; sha256 = "1fayp27vcmypqyzcd4003036h3g5zy6jk1ia25frdca58pzcpk6f"; }; }; - PerlIOutf8_strict = buildPerlPackage rec { - name = "PerlIO-utf8_strict-0.007"; + PerlIOutf8_strict = buildPerlPackage { + pname = "PerlIO-utf8_strict"; + version = "0.007"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; + url = mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.007.tar.gz; sha256 = "83a33f2fe046cb3ad6afc80790635a423e2c7c6854afacc6998cd46951cc81cb"; }; buildInputs = [ TestException ]; @@ -12421,7 +13357,8 @@ let }; PerlIOviadynamic = buildPerlPackage { - name = "PerlIO-via-dynamic-0.14"; + pname = "PerlIO-via-dynamic"; + version = "0.14"; src = fetchurl { url = mirror://cpan/authors/id/A/AL/ALEXMV/PerlIO-via-dynamic-0.14.tar.gz; sha256 = "0jbb3xpbqzmr625blvnjszd69l3cwxzi7bhmkj5x48dgv3s7mkca"; @@ -12429,7 +13366,8 @@ let }; PerlIOviasymlink = buildPerlPackage { - name = "PerlIO-via-symlink-0.05"; + pname = "PerlIO-via-symlink"; + version = "0.05"; src = fetchurl { url = mirror://cpan/authors/id/C/CL/CLKAO/PerlIO-via-symlink-0.05.tar.gz; sha256 = "0lidddcaz9anddqrpqk4zwm550igv6amdhj86i2jjdka9b1x81s1"; @@ -12444,10 +13382,11 @@ let ''; }; - PerlIOviaTimeout = buildPerlModule rec { - name = "PerlIO-via-Timeout-0.32"; + PerlIOviaTimeout = buildPerlModule { + pname = "PerlIO-via-Timeout"; + version = "0.32"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAMS/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DA/DAMS/PerlIO-via-Timeout-0.32.tar.gz; sha256 = "9278f9ef668850d913d98fa4c0d7e7d667cff3503391f4a4eae73a246f2e7916"; }; buildInputs = [ ModuleBuildTiny TestSharedFork TestTCP ]; @@ -12457,10 +13396,11 @@ let }; }; - perlldap = buildPerlPackage rec { - name = "perl-ldap-0.66"; + perlldap = buildPerlPackage { + pname = "perl-ldap"; + version = "0.66"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARSCHAP/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MARSCHAP/perl-ldap-0.66.tar.gz; sha256 = "09263ce6166e80c98d689d41d09995b813389fd069b784601f6dc57f8e2b4102"; }; buildInputs = [ TextSoundex ]; @@ -12473,10 +13413,11 @@ let }; }; - PerlMagick = buildPerlPackage rec { - name = "PerlMagick-6.89-1"; + PerlMagick = buildPerlPackage { + pname = "PerlMagick"; + version = "6.89-1"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JC/JCRISTY/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-6.89-1.tar.gz; sha256 = "0n9afy1z5bhf9phrbahnkwhgcmijn8jggpbzwrivw1zhliliiy68"; }; buildInputs = [ pkgs.imagemagick ]; @@ -12487,10 +13428,11 @@ let doCheck = false; }; - PerlTidy = buildPerlPackage rec { - name = "Perl-Tidy-20181120"; + PerlTidy = buildPerlPackage { + pname = "Perl-Tidy"; + version = "20181120"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHANCOCK/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20181120.tar.gz; sha256 = "7db0eeb76535a62cbb4e69b6558e0705162d476a654a7a5ec472aa846b8c4569"; }; meta = { @@ -12500,7 +13442,8 @@ let }; PHPSerialization = buildPerlPackage { - name = "PHP-Serialization-0.34"; + pname = "PHP-Serialization"; + version = "0.34"; src = fetchurl { url = mirror://cpan/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz; sha256 = "0yphqsgg7zrar2ywk2j2fnjxmi9rq32yf0p5ln8m9fmfx4kd84mr"; @@ -12510,10 +13453,11 @@ let }; }; - PkgConfig = buildPerlPackage rec { - name = "PkgConfig-0.23026"; + PkgConfig = buildPerlPackage { + pname = "PkgConfig"; + version = "0.23026"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/PkgConfig-0.23026.tar.gz; sha256 = "56c8ad9015af3799b99a21b8790997723406acf479f35d13fe9bf632db2d5c26"; }; meta = { @@ -12523,10 +13467,11 @@ let }; }; - Plack = buildPerlPackage rec { - name = "Plack-1.0047"; + Plack = buildPerlPackage { + pname = "Plack"; + version = "1.0047"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0047.tar.gz; sha256 = "322c93f5acc0a0f0e11fd4a76188f978bdc14338a9f1df3ae535227017046561"; }; buildInputs = [ AuthenSimplePasswd CGIEmulatePSGI FileShareDirInstall HTTPRequestAsCGI HTTPServerSimplePSGI IOHandleUtil LWP LWPProtocolhttp10 LogDispatchArray MIMETypes TestMockTimeHiRes TestRequires TestSharedFork TestTCP ]; @@ -12538,8 +13483,9 @@ let }; }; - PlackAppProxy = buildPerlPackage rec { - name = "Plack-App-Proxy-0.29"; + PlackAppProxy = buildPerlPackage { + pname = "Plack-App-Proxy"; + version = "0.29"; src = fetchurl { url = mirror://cpan/authors/id/L/LE/LEEDO/Plack-App-Proxy-0.29.tar.gz; sha256 = "03x6yb6ykz1ms90jp1s0pq19yplf7wswljvhzqkr16jannfrmah4"; @@ -12552,8 +13498,9 @@ let }; }; - PlackMiddlewareAuthDigest = buildPerlModule rec { - name = "Plack-Middleware-Auth-Digest-0.05"; + PlackMiddlewareAuthDigest = buildPerlModule { + pname = "Plack-Middleware-Auth-Digest"; + version = "0.05"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Auth-Digest-0.05.tar.gz; sha256 = "1sqm23kfsl3ac4060zcclc3r86x1vxzhsgvgzg6mxk9njj93zgcs"; @@ -12567,8 +13514,9 @@ let }; }; - PlackMiddlewareConsoleLogger = buildPerlModule rec { - name = "Plack-Middleware-ConsoleLogger-0.05"; + PlackMiddlewareConsoleLogger = buildPerlModule { + pname = "Plack-Middleware-ConsoleLogger"; + version = "0.05"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ConsoleLogger-0.05.tar.gz; sha256 = "1ngvhwdw9ll4cwnvf0i89ppa9pbyiwng6iba04scrqjda353lrsm"; @@ -12582,10 +13530,11 @@ let }; }; - PlackMiddlewareDebug = buildPerlModule rec { - name = "Plack-Middleware-Debug-0.17"; + PlackMiddlewareDebug = buildPerlModule { + pname = "Plack-Middleware-Debug"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Debug-0.17.tar.gz; sha256 = "a30b62f1bb94e641f7b60b5ea5335e140c553b4131ec4003b56db37f47617a26"; }; buildInputs = [ ModuleBuildTiny TestRequires ]; @@ -12597,8 +13546,9 @@ let }; }; - PlackMiddlewareDeflater = buildPerlPackage rec { - name = "Plack-Middleware-Deflater-0.12"; + PlackMiddlewareDeflater = buildPerlPackage { + pname = "Plack-Middleware-Deflater"; + version = "0.12"; src = fetchurl { url = mirror://cpan/authors/id/K/KA/KAZEBURO/Plack-Middleware-Deflater-0.12.tar.gz; sha256 = "0xf2visi16hgwgyp9q0cjr10ikbn474hjia5mj8mb2scvbkrbni8"; @@ -12611,10 +13561,11 @@ let }; }; - PlackMiddlewareFixMissingBodyInRedirect = buildPerlPackage rec { - name = "Plack-Middleware-FixMissingBodyInRedirect-0.12"; + PlackMiddlewareFixMissingBodyInRedirect = buildPerlPackage { + pname = "Plack-Middleware-FixMissingBodyInRedirect"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SW/SWEETKID/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-FixMissingBodyInRedirect-0.12.tar.gz; sha256 = "6c22d069f5a57ac206d4659b28b8869bb9270640bb955efddd451dcc58cdb391"; }; propagatedBuildInputs = [ HTMLParser Plack ]; @@ -12625,8 +13576,9 @@ let }; }; - PlackMiddlewareHeader = buildPerlPackage rec { - name = "Plack-Middleware-Header-0.04"; + PlackMiddlewareHeader = buildPerlPackage { + pname = "Plack-Middleware-Header"; + version = "0.04"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHIBA/Plack-Middleware-Header-0.04.tar.gz; sha256 = "0pjxxbnilphn38s3mmv0fmg9q2hm4z02ngp2a1lxblzjfbzvkdjy"; @@ -12638,8 +13590,9 @@ let }; }; - PlackMiddlewareMethodOverride = buildPerlPackage rec { - name = "Plack-Middleware-MethodOverride-0.20"; + PlackMiddlewareMethodOverride = buildPerlPackage { + pname = "Plack-Middleware-MethodOverride"; + version = "0.20"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-MethodOverride-0.20.tar.gz; sha256 = "dbfb5a2efb48bfeb01cb3ae1e1c677e155dc7bfe210c7e7f221bae3cb6aab5f1"; @@ -12652,7 +13605,8 @@ let }; PlackMiddlewareRemoveRedundantBody = buildPerlPackage { - name = "Plack-Middleware-RemoveRedundantBody-0.07"; + pname = "Plack-Middleware-RemoveRedundantBody"; + version = "0.07"; src = fetchurl { url = mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-RemoveRedundantBody-0.07.tar.gz; sha256 = "64b841d5d74b4c4a595b85749d69297f4f5f5c0829a6e99e0099f05dd69be3c3"; @@ -12666,7 +13620,8 @@ let }; PlackMiddlewareReverseProxy = buildPerlPackage { - name = "Plack-Middleware-ReverseProxy-0.16"; + pname = "Plack-Middleware-ReverseProxy"; + version = "0.16"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ReverseProxy-0.16.tar.gz; sha256 = "0a512n62pnk5ayj3zdzyj50iy1qi8nwh6ygks2h7nrh7gp9k2jc7"; @@ -12678,8 +13633,9 @@ let }; }; - PlackMiddlewareSession = buildPerlModule rec { - name = "Plack-Middleware-Session-0.33"; + PlackMiddlewareSession = buildPerlModule { + pname = "Plack-Middleware-Session"; + version = "0.33"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.33.tar.gz; sha256 = "1vm4a66civdzh7xvl5hy5wn1w8j1vndppwyz8ndh9n4as74s5yag"; @@ -12693,10 +13649,11 @@ let }; }; - PlackTestExternalServer = buildPerlPackage rec { - name = "Plack-Test-ExternalServer-0.02"; + PlackTestExternalServer = buildPerlPackage { + pname = "Plack-Test-ExternalServer"; + version = "0.02"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/Plack-Test-ExternalServer-0.02.tar.gz; sha256 = "5baf5c57fe0c06412deec9c5abe7952ab8a04f8c47b4bbd8e9e9982268903ed0"; }; buildInputs = [ Plack TestSharedFork TestTCP ]; @@ -12709,7 +13666,7 @@ let }; Po4a = buildPerlPackage rec { - name = "po4a-${version}"; + pname = "po4a"; version = "0.55"; src = fetchurl { url = "https://github.com/mquinson/po4a/releases/download/v${version}/po4a-${version}.tar.gz"; @@ -12742,8 +13699,9 @@ let }; }; - POE = buildPerlPackage rec { - name = "POE-1.367"; + POE = buildPerlPackage { + pname = "POE"; + version = "1.367"; patches = [ ../development/perl-modules/perl-POE-1.367-pod_linkcheck.patch ../development/perl-modules/perl-POE-1.367-pod_no404s.patch @@ -12779,10 +13737,11 @@ let ''; }; - POETestLoops = buildPerlPackage rec { - name = "POE-Test-Loops-1.360"; + POETestLoops = buildPerlPackage { + pname = "POE-Test-Loops"; + version = "1.360"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RC/RCAPUTO/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Test-Loops-1.360.tar.gz; sha256 = "0yx4wsljfmdzsiv0ni98x6lw975cm82ahngbwqvzv60wx5pwkl5y"; }; meta = { @@ -12792,10 +13751,11 @@ let }; }; - PPI = buildPerlPackage rec { - name = "PPI-1.236"; + PPI = buildPerlPackage { + pname = "PPI"; + version = "1.236"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MITHALDU/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.236.tar.gz; sha256 = "c6674b349c0b7d9a6d668e789a5e5215477d88ed4c8203aa69a2a50085308aec"; }; buildInputs = [ ClassInspector FileRemove TestDeep TestObject TestSubCalls ]; @@ -12812,8 +13772,9 @@ let }; }; - PPIxQuoteLike = buildPerlModule rec { - name = "PPIx-QuoteLike-0.006"; + PPIxQuoteLike = buildPerlModule { + pname = "PPIx-QuoteLike"; + version = "0.006"; src = fetchurl { url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.006.tar.gz; sha256 = "1gyp3ywnhpv7k3cqdgywpinz7wgqzg38iailcnyiwgl62wib0bsq"; @@ -12825,10 +13786,11 @@ let }; }; - PPIxRegexp = buildPerlModule rec { - name = "PPIx-Regexp-0.064"; + PPIxRegexp = buildPerlModule { + pname = "PPIx-Regexp"; + version = "0.064"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz"; + url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.064.tar.gz; sha256 = "8769c634294c941f83b5a7e74a14eda3671c1fa131b8d6416e7fc77f7cd57408"; }; propagatedBuildInputs = [ PPI ]; @@ -12839,7 +13801,8 @@ let }; PPIxUtilities = buildPerlModule { - name = "PPIx-Utilities-1.001000"; + pname = "PPIx-Utilities"; + version = "1.001000"; src = fetchurl { url = mirror://cpan/authors/id/E/EL/ELLIOTJS/PPIx-Utilities-1.001000.tar.gz; sha256 = "03a483386fd6a2c808f09778d44db06b02c3140fb24ba4bf12f851f46d3bcb9b"; @@ -12852,10 +13815,11 @@ let }; }; - ProcBackground = buildPerlPackage rec { - name = "Proc-Background-1.10"; + ProcBackground = buildPerlPackage { + pname = "Proc-Background"; + version = "1.10"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BZ/BZAJAC/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BZ/BZAJAC/Proc-Background-1.10.tar.gz; sha256 = "1ce0dd78c0bb8393a2431b385a27b99fcc623a41ebec57b3cc09cc38cdb708ee"; }; meta = { @@ -12863,7 +13827,8 @@ let }; ProcProcessTable = buildPerlPackage { - name = "Proc-ProcessTable-0.56"; + pname = "Proc-ProcessTable"; + version = "0.56"; src = fetchurl { url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.56.tar.gz; sha256 = "99fb8fd11e4e438399dd362d95b5b2073f1f340e9b3a7f04e76b6c7428170660"; @@ -12874,10 +13839,11 @@ let }; }; - ProcFind = buildPerlPackage rec { - name = "Proc-Find-0.04"; + ProcFind = buildPerlPackage { + pname = "Proc-Find"; + version = "0.04"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PERLANCAR/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PE/PERLANCAR/Proc-Find-0.04.tar.gz; sha256 = "07d715c2b8644dc6d5b5a36ffcd2f02da017bf86a00027387aa47c53e2347a81"; }; buildInputs = [ Perlosnames ]; @@ -12889,17 +13855,19 @@ let }; ProcSafeExec = buildPerlPackage { - name = "Proc-SafeExec-1.5"; + pname = "Proc-SafeExec"; + version = "1.5"; src = fetchurl { url = mirror://cpan/authors/id/B/BI/BILBO/Proc-SafeExec-1.5.tar.gz; sha256 = "1b4d0908bcac563d34a7e5be61c5da3eee98e4a6c7fa68c2670cc5844b5a2d78"; }; }; - ProcSimple = buildPerlPackage rec { - name = "Proc-Simple-1.32"; + ProcSimple = buildPerlPackage { + pname = "Proc-Simple"; + version = "1.32"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHILLI/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MS/MSCHILLI/Proc-Simple-1.32.tar.gz; sha256 = "4c8f0a924b19ad78a13da73fe0fb306d32a7b9d10a332c523087fc83a209a8c4"; }; meta = { @@ -12908,7 +13876,8 @@ let }; ProcWait3 = buildPerlPackage { - name = "Proc-Wait3-0.05"; + pname = "Proc-Wait3"; + version = "0.05"; src = fetchurl { url = mirror://cpan/authors/id/C/CT/CTILMES/Proc-Wait3-0.05.tar.gz; sha256 = "1a907f5db6933dc2939bbfeffe19eeae7ed39ef1b97a2bc9b723f2f25f81caf3"; @@ -12919,8 +13888,9 @@ let }; }; - ProcWaitStat = buildPerlPackage rec { - name = "Proc-WaitStat-1.00"; + ProcWaitStat = buildPerlPackage { + pname = "Proc-WaitStat"; + version = "1.00"; src = fetchurl { url = mirror://cpan/authors/id/R/RO/ROSCH/Proc-WaitStat-1.00.tar.gz; sha256 = "1g3l8jzx06x4l4p0x7fyn4wvg6plfzl420irwwb9v447wzsn6xfh"; @@ -12928,53 +13898,59 @@ let propagatedBuildInputs = [ IPCSignal ]; }; - ProtocolWebSocket = buildPerlModule rec { - name = "Protocol-WebSocket-0.26"; + ProtocolWebSocket = buildPerlModule { + pname = "Protocol-WebSocket"; + version = "0.26"; src = fetchurl { - url = "mirror://cpan/authors/id/V/VT/VTI/${name}.tar.gz"; + url = mirror://cpan/authors/id/V/VT/VTI/Protocol-WebSocket-0.26.tar.gz; sha256 = "08jmazvrmvp8jn15p2n3c1h3f2cbkr07xjzy197jb8x724vx0dsq"; }; buildInputs = [ ModuleBuildTiny ]; }; - ProtocolHTTP2 = buildPerlModule rec { - name = "Protocol-HTTP2-1.09"; + ProtocolHTTP2 = buildPerlModule { + pname = "Protocol-HTTP2"; + version = "1.09"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CR/CRUX/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CR/CRUX/Protocol-HTTP2-1.09.tar.gz; sha256 = "1bc0ybkqhv81dscgzlbr62w4zqjsidcikmkbjanzn83g2b6ia9nc"; }; buildInputs = [ AnyEvent ModuleBuildTiny NetSSLeay TestLeakTrace TestSharedFork TestTCP ]; }; - PSGI = buildPerlPackage rec { - name = "PSGI-1.102"; + PSGI = buildPerlPackage { + pname = "PSGI"; + version = "1.102"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/PSGI-1.102.tar.gz; sha256 = "0iqzxs8fv63510knm3zr3jr3ky4x7diwd7y24mlshzci81kl8v55"; }; }; - PadWalker = buildPerlPackage rec { - name = "PadWalker-2.3"; + PadWalker = buildPerlPackage { + pname = "PadWalker"; + version = "2.3"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROBIN/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-2.3.tar.gz; sha256 = "2a6c44fb600861e54568e74081a8d1f121f0060076069ceab34b1ae89d6588cf"; }; }; - Perl6Junction = buildPerlPackage rec { - name = "Perl6-Junction-1.60000"; + Perl6Junction = buildPerlPackage { + pname = "Perl6-Junction"; + version = "1.60000"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CF/CFRANKS/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CF/CFRANKS/Perl6-Junction-1.60000.tar.gz; sha256 = "0r3in9pyrm6wfrhcvxbq5w1617x8x5537lxj9hdzks4pa7l7a8yh"; }; }; - PerlMinimumVersion = buildPerlPackage rec { - name = "Perl-MinimumVersion-1.38"; + PerlMinimumVersion = buildPerlPackage { + pname = "Perl-MinimumVersion"; + version = "1.38"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NE/NEILB/Perl-MinimumVersion-1.38.tar.gz; sha256 = "478b5824791b87fc74c94a892180682bd06ad2cdf34034b1a4b859273927802a"; }; buildInputs = [ TestScript ]; @@ -12986,10 +13962,11 @@ let }; }; - PerlPrereqScanner = buildPerlPackage rec { - name = "Perl-PrereqScanner-1.023"; + PerlPrereqScanner = buildPerlPackage { + pname = "Perl-PrereqScanner"; + version = "1.023"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.023.tar.gz; sha256 = "280a1c4710390865fb9f310a861a34720b28b4cbe50609c841af5cf2d3a2bced"; }; propagatedBuildInputs = [ GetoptLongDescriptive ModulePath Moose PPI StringRewritePrefix namespaceautoclean ]; @@ -13001,7 +13978,8 @@ let }; PerlPrereqScannerNotQuiteLite = buildPerlPackage { - name = "Perl-PrereqScanner-NotQuiteLite-0.9904"; + pname = "Perl-PrereqScanner-NotQuiteLite"; + version = "0.9904"; src = fetchurl { url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9904.tar.gz; sha256 = "1qf6x49sjswazh7bicpm7wnwpdnx245ws02s53dvbxcbw2c66hsn"; @@ -13014,10 +13992,11 @@ let }; }; - PerlVersion = buildPerlPackage rec { - name = "Perl-Version-1.013"; + PerlVersion = buildPerlPackage { + pname = "Perl-Version"; + version = "1.013"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BD/BDFOY/Perl-Version-1.013.tar.gz; sha256 = "1887414d1c8689d864c840114101e043e99d7dd5b9cca69369a60e821e3ad0f7"; }; propagatedBuildInputs = [ FileSlurpTiny ]; @@ -13028,24 +14007,27 @@ let }; PodChecker = buildPerlPackage { - name = "Pod-Checker-1.73"; + pname = "Pod-Checker"; + version = "1.73"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.73.tar.gz; sha256 = "7dee443b03d80d0735ec50b6d1caf0209c51ab0a97d64050cfc10e1555cb9305"; }; }; - PodCoverage = buildPerlPackage rec { - name = "Pod-Coverage-0.23"; + PodCoverage = buildPerlPackage { + pname = "Pod-Coverage"; + version = "0.23"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RC/RCLAMP/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RC/RCLAMP/Pod-Coverage-0.23.tar.gz; sha256 = "01xifj83dv492lxixijmg6va02rf3ydlxly0a9slmx22r6qa1drh"; }; propagatedBuildInputs = [ DevelSymdump ]; }; PodCoverageTrustPod = buildPerlPackage { - name = "Pod-Coverage-TrustPod-0.100005"; + pname = "Pod-Coverage-TrustPod"; + version = "0.100005"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100005.tar.gz; sha256 = "08bk6lfimr2pwi6c92xg5cw1cxmi5fqhls3yasqzpjnd4if86s3c"; @@ -13058,10 +14040,11 @@ let }; }; - PodElemental = buildPerlPackage rec { - name = "Pod-Elemental-0.103004"; + PodElemental = buildPerlPackage { + pname = "Pod-Elemental"; + version = "0.103004"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-0.103004.tar.gz; sha256 = "43625cde7241fb174ad9c7eb45387fba410dc141d7de2323855eeab3590072c9"; }; buildInputs = [ TestDeep TestDifferences ]; @@ -13073,10 +14056,11 @@ let }; }; - PodElementalPerlMunger = buildPerlPackage rec { - name = "Pod-Elemental-PerlMunger-0.200006"; + PodElementalPerlMunger = buildPerlPackage { + pname = "Pod-Elemental-PerlMunger"; + version = "0.200006"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.200006.tar.gz; sha256 = "09fd3b5d53119437a01dced66b42eafdcd53895b3c32a2b0f781f36fda0f665b"; }; buildInputs = [ TestDifferences ]; @@ -13089,7 +14073,8 @@ let }; PodEventual = buildPerlPackage { - name = "Pod-Eventual-0.094001"; + pname = "Pod-Eventual"; + version = "0.094001"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Eventual-0.094001.tar.gz; sha256 = "be9fb8910b108e5d1a66f002b659ad22576e88d779b703dff9d15122c3f80834"; @@ -13103,7 +14088,8 @@ let }; PodParser = buildPerlPackage { - name = "Pod-Parser-1.63"; + pname = "Pod-Parser"; + version = "1.63"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Parser-1.63.tar.gz; sha256 = "dbe0b56129975b2f83a02841e8e0ed47be80f060686c66ea37e529d97aa70ccd"; @@ -13114,10 +14100,11 @@ let }; }; - PodPOM = buildPerlPackage rec { - name = "Pod-POM-2.01"; + PodPOM = buildPerlPackage { + pname = "Pod-POM"; + version = "2.01"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NE/NEILB/Pod-POM-2.01.tar.gz; sha256 = "1b50fba9bbdde3ead192beeba0eaddd0c614e3afb1743fa6fff805f57c56f7f4"; }; buildInputs = [ FileSlurper TestDifferences TextDiff ]; @@ -13128,10 +14115,11 @@ let }; }; - PodPOMViewTOC = buildPerlPackage rec { - name = "Pod-POM-View-TOC-0.02"; + PodPOMViewTOC = buildPerlPackage { + pname = "Pod-POM-View-TOC"; + version = "0.02"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PERLER/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PE/PERLER/Pod-POM-View-TOC-0.02.tar.gz; sha256 = "ccb42272c7503379cb1131394620ee50276d72844e0e80eb4b007a9d58f87623"; }; propagatedBuildInputs = [ PodPOM ]; @@ -13141,10 +14129,11 @@ let }; }; - PodLaTeX = buildPerlModule rec { - name = "Pod-LaTeX-0.61"; + PodLaTeX = buildPerlModule { + pname = "Pod-LaTeX"; + version = "0.61"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TJ/TJENNESS/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz; sha256 = "15a840ea1c8a76cd3c865fbbf2fec33b03615c0daa50f9c800c54e0cf0659d46"; }; meta = { @@ -13154,10 +14143,11 @@ let }; }; - podlators = buildPerlPackage rec { - name = "podlators-4.10"; + podlators = buildPerlPackage { + pname = "podlators"; + version = "4.10"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RR/RRA/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RR/RRA/podlators-4.10.tar.gz; sha256 = "008b4j41ijrfyyq5nd3y7pqyww6rg49fjg2c6kmpnqrmgs347qqp"; }; meta = { @@ -13166,10 +14156,11 @@ let }; }; - podlinkcheck = buildPerlPackage rec { - name = "podlinkcheck-15"; + podlinkcheck = buildPerlPackage { + pname = "podlinkcheck"; + version = "15"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KR/KRYDE/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KR/KRYDE/podlinkcheck-15.tar.gz; sha256 = "4e3bebec1bf82dbf850a94ae26a253644cf5806ec41afc74e43e1710a37321db"; }; propagatedBuildInputs = [ FileFindIterator FileHomeDir IPCRun constant-defer libintl_perl ]; @@ -13181,7 +14172,8 @@ let }; prefork = buildPerlPackage { - name = "prefork-1.05"; + pname = "prefork"; + version = "1.05"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/prefork-1.05.tar.gz; sha256 = "01ckn45ij3nbrsc0yc4wl4z0wndn36jh6247zbycwa1vlvgvr1vd"; @@ -13192,10 +14184,11 @@ let }; }; - PodPerldoc = buildPerlPackage rec { - name = "Pod-Perldoc-3.28"; + PodPerldoc = buildPerlPackage { + pname = "Pod-Perldoc"; + version = "3.28"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MALLEN/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MALLEN/Pod-Perldoc-3.28.tar.gz; sha256 = "0kf6xwdha8jl0nxv60r2v7xsfnvv6i3gy135xsl40g71p02ychfc"; }; meta = { @@ -13205,7 +14198,8 @@ let }; PodPlainer = buildPerlPackage { - name = "Pod-Plainer-1.04"; + pname = "Pod-Plainer"; + version = "1.04"; src = fetchurl { url = mirror://cpan/authors/id/R/RM/RMBARKER/Pod-Plainer-1.04.tar.gz; sha256 = "1bbfbf7d1d4871e5a83bab2137e22d089078206815190eb1d5c1260a3499456f"; @@ -13217,7 +14211,8 @@ let }; PodMarkdown = buildPerlPackage { - name = "Pod-Markdown-3.101"; + pname = "Pod-Markdown"; + version = "3.101"; src = fetchurl { url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-3.101.tar.gz; sha256 = "0h7hx4k1c3k00cfnlf226bkxnxaz01705m10vxm9cxh52xn6pzz8"; @@ -13230,8 +14225,9 @@ let }; }; - PodMarkdownGithub = buildPerlPackage rec { - name = "Pod-Markdown-Github-0.04"; + PodMarkdownGithub = buildPerlPackage { + pname = "Pod-Markdown-Github"; + version = "0.04"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.04.tar.gz; sha256 = "04y67c50hpf1vb9cwsza3fbj4rshdqa47vi3zcj4kkjckh02yzmk"; @@ -13245,15 +14241,17 @@ let }; PodSimple = buildPerlPackage { - name = "Pod-Simple-3.35"; + pname = "Pod-Simple"; + version = "3.35"; src = fetchurl { url = mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.35.tar.gz; sha256 = "0gg11ibbc02l2aw0bsv4jx0jax8z0apgfy3p5csqnvhlsb6218cr"; }; }; - PodSpell = buildPerlPackage rec { - name = "Pod-Spell-1.20"; + PodSpell = buildPerlPackage { + pname = "Pod-Spell"; + version = "1.20"; src = fetchurl { url = mirror://cpan/authors/id/D/DO/DOLMEN/Pod-Spell-1.20.tar.gz; sha256 = "6383f7bfe22bc0d839a08057a0ce780698b046184aea935be4833d94986dd03c"; @@ -13262,8 +14260,9 @@ let buildInputs = [ FileShareDirInstall TestDeep ]; }; - PodStrip = buildPerlModule rec { - name = "Pod-Strip-1.02"; + PodStrip = buildPerlModule { + pname = "Pod-Strip"; + version = "1.02"; src = fetchurl { url = mirror://cpan/authors/id/D/DO/DOMM/Pod-Strip-1.02.tar.gz; sha256 = "1zsjfw2cjq1bd3ppl67fdvrx46vj9lina0c3cv9qgk5clzvaq3fq"; @@ -13274,8 +14273,9 @@ let }; }; - PodTidy = buildPerlModule rec { - name = "Pod-Tidy-0.10"; + PodTidy = buildPerlModule { + pname = "Pod-Tidy"; + version = "0.10"; src = fetchurl { url = mirror://cpan/authors/id/J/JH/JHOBLITT/Pod-Tidy-0.10.tar.gz; sha256 = "1gcxjplgksnc5iggi8dzbkbkcryii5wjhypd7fs3kmbwx91y2vl8"; @@ -13288,10 +14288,11 @@ let }; }; - PodWeaver = buildPerlPackage rec { - name = "Pod-Weaver-4.015"; + PodWeaver = buildPerlPackage { + pname = "Pod-Weaver"; + version = "4.015"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-4.015.tar.gz; sha256 = "5af25b29a55783e495a9df5ef6293240e2c9ab02764613d79f1ed50b12dec5ae"; }; buildInputs = [ PPI SoftwareLicense TestDifferences ]; @@ -13303,8 +14304,9 @@ let }; }; - PodWrap = buildPerlModule rec { - name = "Pod-Wrap-0.01"; + PodWrap = buildPerlModule { + pname = "Pod-Wrap"; + version = "0.01"; src = fetchurl { url = mirror://cpan/authors/id/N/NU/NUFFIN/Pod-Wrap-0.01.tar.gz; sha256 = "0qwb5hp26f85xnb3zivf8ccfdplabiyl5sd53c6wgdgvzzicpjjh"; @@ -13314,18 +14316,20 @@ let }; }; - ProbePerl = buildPerlPackage rec { - name = "Probe-Perl-0.03"; + ProbePerl = buildPerlPackage { + pname = "Probe-Perl"; + version = "0.03"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KW/KWILLIAMS/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Probe-Perl-0.03.tar.gz; sha256 = "0c9wiaz0mqqknafr4jdr0g2gdzxnn539182z0icqaqvp5qgd5r6r"; }; }; - POSIXstrftimeCompiler = buildPerlModule rec { - name = "POSIX-strftime-Compiler-0.42"; + POSIXstrftimeCompiler = buildPerlModule { + pname = "POSIX-strftime-Compiler"; + version = "0.42"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KA/KAZEBURO/POSIX-strftime-Compiler-0.42.tar.gz; sha256 = "26582bdd78b254bcc1c56d0b770fa280e8b8f70957c84dc44572ba4cacb0ac11"; }; # We cannot change timezones on the fly. @@ -13337,10 +14341,11 @@ let }; }; - Razor2ClientAgent = buildPerlPackage rec { - name = "Razor2-Client-Agent-2.84"; + Razor2ClientAgent = buildPerlPackage { + pname = "Razor2-Client-Agent"; + version = "2.84"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TO/TODDR/Razor2-Client-Agent-2.84.tar.gz; sha256 = "d7c2ed7f347a673b1425e4da7656073d6c52847bc7403bf57e3a404b52f7e501"; }; propagatedBuildInputs = [ DigestSHA1 URI ]; @@ -13352,10 +14357,11 @@ let }; - Readonly = buildPerlModule rec { - name = "Readonly-2.05"; + Readonly = buildPerlModule { + pname = "Readonly"; + version = "2.05"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SANKO/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SA/SANKO/Readonly-2.05.tar.gz; sha256 = "4b23542491af010d44a5c7c861244738acc74ababae6b8838d354dfb19462b5e"; }; buildInputs = [ ModuleBuildTiny ]; @@ -13366,19 +14372,21 @@ let }; }; - ReadonlyXS = buildPerlPackage rec { - name = "Readonly-XS-1.05"; + ReadonlyXS = buildPerlPackage { + pname = "Readonly-XS"; + version = "1.05"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROODE/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RO/ROODE/Readonly-XS-1.05.tar.gz; sha256 = "8ae5c4e85299e5c8bddd1b196f2eea38f00709e0dc0cb60454dc9114ae3fff0d"; }; propagatedBuildInputs = [ Readonly ]; }; - Redis = buildPerlModule rec { - name = "Redis-1.991"; + Redis = buildPerlModule { + pname = "Redis"; + version = "1.991"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAMS/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DA/DAMS/Redis-1.991.tar.gz; sha256 = "f7d1a934fa9360a26e480f896f97be0fd62807f9d9baca65a9aa8d007ff2acaa"; }; buildInputs = [ IOString ModuleBuildTiny PodCoverageTrustPod TestCPANMeta TestDeep TestFatal TestSharedFork TestTCP ]; @@ -13391,7 +14399,8 @@ let }; RefUtil = buildPerlPackage { - name = "Ref-Util-0.204"; + pname = "Ref-Util"; + version = "0.204"; src = fetchurl { url = mirror://cpan/authors/id/A/AR/ARC/Ref-Util-0.204.tar.gz; sha256 = "1q85y5lzgl8wz5qnz3j6mch2fmllr668h54wszaz6i6gp8ysfps1"; @@ -13402,8 +14411,9 @@ let }; }; - RegexpAssemble = buildPerlPackage rec { - name = "Regexp-Assemble-0.38"; + RegexpAssemble = buildPerlPackage { + pname = "Regexp-Assemble"; + version = "0.38"; src = fetchurl { url = mirror://cpan/authors/id/R/RS/RSAVAGE/Regexp-Assemble-0.38.tgz; sha256 = "0hp4v8mghmpflq9l9fqrkjg4cw0d3ha2nrmnsnzwjwqvmvwyfsx0"; @@ -13411,7 +14421,8 @@ let }; RegexpCommon = buildPerlPackage { - name = "Regexp-Common-2017060201"; + pname = "Regexp-Common"; + version = "2017060201"; src = fetchurl { url = mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2017060201.tar.gz; sha256 = "ee07853aee06f310e040b6bf1a0199a18d81896d3219b9b35c9630d0eb69089b"; @@ -13423,7 +14434,8 @@ let }; RegexpCommonnetCIDR = buildPerlPackage { - name = "Regexp-Common-net-CIDR-0.03"; + pname = "Regexp-Common-net-CIDR"; + version = "0.03"; src = fetchurl { url = mirror://cpan/authors/id/B/BP/BPS/Regexp-Common-net-CIDR-0.03.tar.gz; sha256 = "39606a57aab20d4f4468300f2ec3fa2ab557fcc9cb7880ec7c6e07d80162da33"; @@ -13434,10 +14446,11 @@ let }; }; - RegexpGrammars = buildPerlModule rec { - name = "Regexp-Grammars-1.049"; + RegexpGrammars = buildPerlModule { + pname = "Regexp-Grammars"; + version = "1.049"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCONWAY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.049.tar.gz; sha256 = "2e642a7051b9ea5dccd05d53e49684ca28e99c43b811bbec37d160d3f81edf68"; }; meta = { @@ -13447,7 +14460,8 @@ let }; RegexpIPv6 = buildPerlPackage { - name = "Regexp-IPv6-0.03"; + pname = "Regexp-IPv6"; + version = "0.03"; src = fetchurl { url = mirror://cpan/authors/id/S/SA/SALVA/Regexp-IPv6-0.03.tar.gz; sha256 = "d542d17d75ce93631de8ba2156da0e0b58a755c409cd4a0d27a3873a26712ce2"; @@ -13455,7 +14469,8 @@ let }; RegexpParser = buildPerlPackage { - name = "Regexp-Parser-0.22"; + pname = "Regexp-Parser"; + version = "0.22"; src = fetchurl { url = mirror://cpan/authors/id/T/TO/TODDR/Regexp-Parser-0.22.tar.gz; sha256 = "d6d3c711657a380f1cb24d8b54a1cd20f725f7f54665189e9e67bb0b877109a3"; @@ -13468,7 +14483,8 @@ let }; RegexpTrie = buildPerlPackage { - name = "Regexp-Trie-0.02"; + pname = "Regexp-Trie"; + version = "0.02"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DANKOGAI/Regexp-Trie-0.02.tar.gz; sha256 = "1yn5l6x3xyic9jxw9jggqsbggcv7rc8ggj4zbnlz9hfvv17gjazv"; @@ -13477,10 +14493,11 @@ let }; }; - RESTClient = buildPerlPackage rec { - name = "REST-Client-273"; + RESTClient = buildPerlPackage { + pname = "REST-Client"; + version = "273"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KK/KKANE/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KK/KKANE/REST-Client-273.tar.gz; sha256 = "a8652a2214308faff2c68be5ce64c904dcccc5e86be7f32376c1590869d01844"; }; propagatedBuildInputs = [ LWPProtocolHttps ]; @@ -13491,7 +14508,8 @@ let }; RESTUtils = buildPerlModule { - name = "REST-Utils-0.6"; + pname = "REST-Utils"; + version = "0.6"; src = fetchurl { url = mirror://cpan/authors/id/J/JA/JALDHAR/REST-Utils-0.6.tar.gz; sha256 = "1zdrf3315rp2b8r9dwwj5h93xky7i33iawf4hzszwcddhzflmsfl"; @@ -13505,7 +14523,8 @@ let }; RpcXML = buildPerlPackage { - name = "RPC-XML-0.80"; + pname = "RPC-XML"; + version = "0.80"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.80.tar.gz; sha256 = "1xvy9hs7bqsjnk0663kf7zk2qjg0pzv96n6z2wlc2w5bgal7q3ga"; @@ -13515,7 +14534,8 @@ let }; ReturnValue = buildPerlPackage { - name = "Return-Value-1.666005"; + pname = "Return-Value"; + version = "1.666005"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.666005.tar.gz; sha256 = "1b2hfmdl19zi1z3npzv9wf6dh1g0xd88i70b4233ds9icnln08lf"; @@ -13523,7 +14543,8 @@ let }; RoleBasic = buildPerlModule { - name = "Role-Basic-0.13"; + pname = "Role-Basic"; + version = "0.13"; src = fetchurl { url = mirror://cpan/authors/id/O/OV/OVID/Role-Basic-0.13.tar.gz; sha256 = "38a0959ef9f193ff76e72c325a9e9211bc4868689bd0e2b005778f53f8b6f36a"; @@ -13535,7 +14556,8 @@ let }; RoleHasMessage = buildPerlPackage { - name = "Role-HasMessage-0.006"; + pname = "Role-HasMessage"; + version = "0.006"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Role-HasMessage-0.006.tar.gz; sha256 = "1lylfvarjfy6wy34dfny3032pc6r33mjby5yzzhmxybg8zhdp9pn"; @@ -13548,7 +14570,8 @@ let }; RoleIdentifiable = buildPerlPackage { - name = "Role-Identifiable-0.007"; + pname = "Role-Identifiable"; + version = "0.007"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Role-Identifiable-0.007.tar.gz; sha256 = "1bbkj2wqpbfdw1cbm99vg9d94rvzba19m18xhnylaym0l78lc4sn"; @@ -13560,10 +14583,11 @@ let }; }; - RoleTiny = buildPerlPackage rec { - name = "Role-Tiny-2.000006"; + RoleTiny = buildPerlPackage { + pname = "Role-Tiny"; + version = "2.000006"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; + url = mirror://cpan/authors/id/H/HA/HAARG/Role-Tiny-2.000006.tar.gz; sha256 = "cc73418c904a0286ecd8915eac11f5be2a8d1e17ea9cb54c9116b0340cd3e382"; }; meta = { @@ -13573,7 +14597,8 @@ let }; RSSParserLite = buildPerlPackage { - name = "RSS-Parser-Lite-0.12"; + pname = "RSS-Parser-Lite"; + version = "0.12"; src = fetchurl { url = mirror://cpan/authors/id/T/TF/TFPBL/RSS-Parser-Lite-0.12.tar.gz; sha256 = "1fcmp4qp7q3xr2mw7clqqwph45icbvgfs2n41gp9zamim2y39p49"; @@ -13583,7 +14608,8 @@ let }; RTClientREST = buildPerlModule { - name = "RT-Client-REST-0.56"; + pname = "RT-Client-REST"; + version = "0.56"; src = fetchurl { url = mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.56.tar.gz; sha256 = "798baccf11eaecbb7d2d27be0b5e4fa9cb80b34cc51cab12eb7b88facf39fd4b"; @@ -13597,7 +14623,8 @@ let }; SafeIsa = buildPerlPackage { - name = "Safe-Isa-1.000010"; + pname = "Safe-Isa"; + version = "1.000010"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000010.tar.gz; sha256 = "0sm6p1kw98s7j6n92vvxjqf818xggnmjwci34xjmw7gzl2519x47"; @@ -13609,7 +14636,8 @@ let }; ScalarListUtils = buildPerlPackage { - name = "Scalar-List-Utils-1.50"; + pname = "Scalar-List-Utils"; + version = "1.50"; src = fetchurl { url = mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.50.tar.gz; sha256 = "06aab9c693380190e53be09be7daed20c5d6278f71956989c24cca7782013675"; @@ -13620,25 +14648,28 @@ let }; }; - ScalarString = buildPerlModule rec { - name = "Scalar-String-0.003"; + ScalarString = buildPerlModule { + pname = "Scalar-String"; + version = "0.003"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Scalar-String-0.003.tar.gz; sha256 = "f54a17c9b78713b02cc43adfadf60b49467e7634d31317e8b9e9e97c26d68b52"; }; }; - SCGI = buildPerlModule rec { - name = "SCGI-0.6"; + SCGI = buildPerlModule { + pname = "SCGI"; + version = "0.6"; src = fetchurl { - url = "mirror://cpan/authors/id/V/VI/VIPERCODE/${name}.tar.gz"; + url = mirror://cpan/authors/id/V/VI/VIPERCODE/SCGI-0.6.tar.gz; sha256 = "196rj47mh4fq2vlnw595q391zja5v6qg7s3sy0vy8igfyid8rdsq"; }; preConfigure = "export HOME=$(mktemp -d)"; }; ScopeGuard = buildPerlPackage { - name = "Scope-Guard-0.21"; + pname = "Scope-Guard"; + version = "0.21"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz; sha256 = "0y6jfzvxiz8h5yfz701shair0ilypq2mvimd7wn8wi2nbkm1p6wc"; @@ -13649,10 +14680,11 @@ let }; }; - ScopeUpper = buildPerlPackage rec { - name = "Scope-Upper-0.31"; + ScopeUpper = buildPerlPackage { + pname = "Scope-Upper"; + version = "0.31"; src = fetchurl { - url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz"; + url = mirror://cpan/authors/id/V/VP/VPIT/Scope-Upper-0.31.tar.gz; sha256 = "cc4d2ce0f185b4867d73b4083991117052a523fd409debf15bdd7e374cc16d8c"; }; meta = { @@ -13661,10 +14693,11 @@ let }; }; - SerealDecoder = buildPerlPackage rec { - name = "Sereal-Decoder-4.007"; + SerealDecoder = buildPerlPackage { + pname = "Sereal-Decoder"; + version = "4.007"; src = fetchurl { - url = "mirror://cpan/authors/id/Y/YV/YVES/${name}.tar.gz"; + url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.007.tar.gz; sha256 = "0jyczxlpn2axgmx5vyjwjvr0myvi0yxnjpp8g7hj4b388j1i2205"; }; buildInputs = [ TestDeep TestDifferences TestLongString TestWarn ]; @@ -13677,10 +14710,11 @@ let }; }; - SerealEncoder = buildPerlPackage rec { - name = "Sereal-Encoder-4.007"; + SerealEncoder = buildPerlPackage { + pname = "Sereal-Encoder"; + version = "4.007"; src = fetchurl { - url = "mirror://cpan/authors/id/Y/YV/YVES/${name}.tar.gz"; + url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-4.007.tar.gz; sha256 = "1dpafqlsir79p9g1j85k7bbn9kckqdb1zdngmmw1r46cizfdsvxz"; }; buildInputs = [ SerealDecoder TestDeep TestDifferences TestLongString TestWarn ]; @@ -13692,10 +14726,11 @@ let }; }; - Sereal = buildPerlPackage rec { - name = "Sereal-4.007"; + Sereal = buildPerlPackage { + pname = "Sereal"; + version = "4.007"; src = fetchurl { - url = "mirror://cpan/authors/id/Y/YV/YVES/${name}.tar.gz"; + url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.007.tar.gz; sha256 = "0ncsfsz9dvqay77hb0gzfx1qsg8xkz50h47q082gqnlf5q3l63j5"; }; buildInputs = [ TestLongString TestWarn ]; @@ -13708,10 +14743,11 @@ let }; }; - ServerStarter = buildPerlModule rec { - name = "Server-Starter-0.34"; + ServerStarter = buildPerlModule { + pname = "Server-Starter"; + version = "0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KA/KAZUHO/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KA/KAZUHO/Server-Starter-0.34.tar.gz; sha256 = "96a20d4a1f341655bd1b26df5795d57c5d7498d9bcf8ca9d0d6e2ed743608f78"; }; buildInputs = [ TestRequires TestSharedFork TestTCP ]; @@ -13723,7 +14759,8 @@ let }; SetInfinite = buildPerlPackage { - name = "Set-Infinite-0.65"; + pname = "Set-Infinite"; + version = "0.65"; src = fetchurl { url = mirror://cpan/authors/id/F/FG/FGLOCK/Set-Infinite-0.65.tar.gz; sha256 = "07bc880734492de40b4a3a8b5a331762f64e69b4629029fd9a9d357b25b87e1f"; @@ -13733,8 +14770,9 @@ let }; }; - SetIntSpan = buildPerlPackage rec { - name = "Set-IntSpan-1.19"; + SetIntSpan = buildPerlPackage { + pname = "Set-IntSpan"; + version = "1.19"; src = fetchurl { url = mirror://cpan/authors/id/S/SW/SWMCD/Set-IntSpan-1.19.tar.gz; sha256 = "1l6znd40ylzvfwl02rlqzvakv602rmvwgm2xd768fpgc2fdm9dqi"; @@ -13745,10 +14783,11 @@ let }; }; - SetObject = buildPerlPackage rec { - name = "Set-Object-1.39"; + SetObject = buildPerlPackage { + pname = "Set-Object"; + version = "1.39"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RU/RURBAN/Set-Object-1.39.tar.gz; sha256 = "5effcfeb104da334f413a20dee9cdc5e874246096c3b282190a5f44453401810"; }; meta = { @@ -13758,7 +14797,8 @@ let }; SetScalar = buildPerlPackage { - name = "Set-Scalar-1.29"; + pname = "Set-Scalar"; + version = "1.29"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DAVIDO/Set-Scalar-1.29.tar.gz; sha256 = "07aiqkyi1p22drpcyrrmv7f8qq6fhrxh007achy2vryxyck1bp53"; @@ -13768,8 +14808,9 @@ let }; }; - SGMLSpm = buildPerlPackage { - name = "SGMLSpm-1.1"; + SGMLSpm = buildPerlModule { + pname = "SGMLSpm"; + version = "1.1"; src = fetchurl { url = mirror://cpan/authors/id/R/RA/RAAB/SGMLSpm-1.1.tar.gz; sha256 = "1gdjf3mcz2bxir0l9iljxiz6qqqg3a9gg23y5wjg538w552r432m"; @@ -13777,7 +14818,8 @@ let }; SignalMask = buildPerlPackage { - name = "Signal-Mask-0.008"; + pname = "Signal-Mask"; + version = "0.008"; src = fetchurl { url = mirror://cpan/authors/id/L/LE/LEONT/Signal-Mask-0.008.tar.gz; sha256 = "043d995b6b249d9ebc04c467db31bb7ddc2e55faa08e885bdb050b1f2336b73f"; @@ -13789,8 +14831,9 @@ let }; }; - SnowballNorwegian = buildPerlModule rec { - name = "Snowball-Norwegian-1.2"; + SnowballNorwegian = buildPerlModule { + pname = "Snowball-Norwegian"; + version = "1.2"; src = fetchurl { url = mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Norwegian-1.2.tar.gz; sha256 = "0675v45bbsh7vr7kpf36xs2q79g02iq1kmfw22h20xdk4rzqvkqx"; @@ -13801,8 +14844,9 @@ let }; }; - SnowballSwedish = buildPerlModule rec { - name = "Snowball-Swedish-1.2"; + SnowballSwedish = buildPerlModule { + pname = "Snowball-Swedish"; + version = "1.2"; src = fetchurl { url = mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Swedish-1.2.tar.gz; sha256 = "0agwc12jk5kmabnpsplw3wf4ii5w1zb159cpin44x3srb0sr5apg"; @@ -13814,7 +14858,8 @@ let }; SOAPLite = buildPerlPackage { - name = "SOAP-Lite-1.27"; + pname = "SOAP-Lite"; + version = "1.27"; src = fetchurl { url = mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.27.tar.gz; sha256 = "00fkvmnxiy5mr45rj5qmxmflw0xdkw2gihm48iha2i8smdmi0ng3"; @@ -13827,10 +14872,11 @@ let buildInputs = [ TestWarn XMLParserLite ]; }; - Socket6 = buildPerlPackage rec { - name = "Socket6-0.29"; + Socket6 = buildPerlPackage { + pname = "Socket6"; + version = "0.29"; src = fetchurl { - url = "mirror://cpan/authors/id/U/UM/UMEMOTO/${name}.tar.gz"; + url = mirror://cpan/authors/id/U/UM/UMEMOTO/Socket6-0.29.tar.gz; sha256 = "468915fa3a04dcf6574fc957eff495915e24569434970c91ee8e4e1459fc9114"; }; setOutputFlags = false; @@ -13842,10 +14888,11 @@ let }; }; - SoftwareLicense = buildPerlPackage rec { - name = "Software-License-0.103014"; + SoftwareLicense = buildPerlPackage { + pname = "Software-License"; + version = "0.103014"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; + url = mirror://cpan/authors/id/L/LE/LEONT/Software-License-0.103014.tar.gz; sha256 = "eb45ea602d75006683789fbba57a01c0a1f7037371de95ea54b91577535d1789"; }; buildInputs = [ TryTiny ]; @@ -13857,8 +14904,9 @@ let }; }; - SoftwareLicenseCCpack = buildPerlPackage rec { - name = "Software-License-CCpack-1.11"; + SoftwareLicenseCCpack = buildPerlPackage { + pname = "Software-License-CCpack"; + version = "1.11"; src = fetchurl { url = mirror://cpan/authors/id/B/BB/BBYRD/Software-License-CCpack-1.11.tar.gz; sha256 = "1cakbn7am8mhalwas5h33l7c6avdqpg42z478p6rav11pim5qksr"; @@ -13872,10 +14920,11 @@ let }; }; - SortKey = buildPerlPackage rec { - name = "Sort-Key-1.33"; + SortKey = buildPerlPackage { + pname = "Sort-Key"; + version = "1.33"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SA/SALVA/Sort-Key-1.33.tar.gz; sha256 = "1kqs10s2plj6c96srk0j8d7xj8dxk1704r7mck8rqk09mg7lqspd"; }; meta = { @@ -13884,16 +14933,18 @@ let }; }; - SortVersions = buildPerlPackage rec { - name = "Sort-Versions-1.62"; + SortVersions = buildPerlPackage { + pname = "Sort-Versions"; + version = "1.62"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEILB/Sort-Versions-1.62.tar.gz; sha256 = "1aifzm79ky03gi2lwxyx4mk6yky8x215j0kz4f0jbgkf803k6pxz"; }; }; - Specio = buildPerlPackage rec { - name = "Specio-0.43"; + Specio = buildPerlPackage { + pname = "Specio"; + version = "0.43"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.43.tar.gz; sha256 = "07gsm4fssn9v27bnlgcxa7igb7ggrxwgpdqbbryi4134gfzxxl1w"; @@ -13906,8 +14957,9 @@ let }; }; - SpecioLibraryPathTiny = buildPerlPackage rec { - name = "Specio-Library-Path-Tiny-0.04"; + SpecioLibraryPathTiny = buildPerlPackage { + pname = "Specio-Library-Path-Tiny"; + version = "0.04"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-Library-Path-Tiny-0.04.tar.gz; sha256 = "0cyfx8gigsgisdwynjamh8jkpad23sr8v6a98hq285zmibm16s7g"; @@ -13920,18 +14972,20 @@ let }; }; - Spiffy = buildPerlPackage rec { - name = "Spiffy-0.46"; + Spiffy = buildPerlPackage { + pname = "Spiffy"; + version = "0.46"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; + url = mirror://cpan/authors/id/I/IN/INGY/Spiffy-0.46.tar.gz; sha256 = "18qxshrjh0ibpzjm2314157mxlibh3smyg64nr4mq990hh564n4g"; }; }; - SpreadsheetParseExcel = buildPerlPackage rec { - name = "Spreadsheet-ParseExcel-0.65"; + SpreadsheetParseExcel = buildPerlPackage { + pname = "Spreadsheet-ParseExcel"; + version = "0.65"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOUGW/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DO/DOUGW/Spreadsheet-ParseExcel-0.65.tar.gz; sha256 = "6ec4cb429bd58d81640fe12116f435c46f51ff1040c68f09cc8b7681c1675bec"; }; propagatedBuildInputs = [ CryptRC4 DigestPerlMD5 IOStringy OLEStorage_Lite ]; @@ -13942,10 +14996,11 @@ let }; }; - SpreadsheetWriteExcel = buildPerlPackage rec { - name = "Spreadsheet-WriteExcel-2.40"; + SpreadsheetWriteExcel = buildPerlPackage { + pname = "Spreadsheet-WriteExcel"; + version = "2.40"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JM/JMCNAMARA/Spreadsheet-WriteExcel-2.40.tar.gz; sha256 = "e356aad6866cf135731268ee0e979a197443c15a04878e9cf3e80d022ad6c07e"; }; propagatedBuildInputs = [ OLEStorage_Lite ParseRecDescent ]; @@ -13955,10 +15010,11 @@ let }; }; - SQLAbstract = buildPerlPackage rec { - name = "SQL-Abstract-1.86"; + SQLAbstract = buildPerlPackage { + pname = "SQL-Abstract"; + version = "1.86"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; + url = mirror://cpan/authors/id/I/IL/ILMARI/SQL-Abstract-1.86.tar.gz; sha256 = "e7a7f7da5e6fa42f495860e92e9138b8a0964ca7674c95bd6ff1b1ce21aa8cdf"; }; buildInputs = [ TestDeep TestException TestWarn ]; @@ -13969,18 +15025,20 @@ let }; }; - SQLAbstractLimit = buildPerlModule rec { - name = "SQL-Abstract-Limit-0.141"; + SQLAbstractLimit = buildPerlModule { + pname = "SQL-Abstract-Limit"; + version = "0.141"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAVEBAIRD/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DA/DAVEBAIRD/SQL-Abstract-Limit-0.141.tar.gz; sha256 = "1qqh89kz065mkgyg5pjcgbf8qcpzfk8vf1lgkbwynknadmv87zqg"; }; propagatedBuildInputs = [ DBI SQLAbstract ]; buildInputs = [ TestDeep TestException ]; }; - SQLSplitStatement = buildPerlPackage rec { - name = "SQL-SplitStatement-1.00020"; + SQLSplitStatement = buildPerlPackage { + pname = "SQL-SplitStatement"; + version = "1.00020"; src = fetchurl { url = mirror://cpan/authors/id/E/EM/EMAZEP/SQL-SplitStatement-1.00020.tar.gz; sha256 = "0bqg45k4c9qkb2ypynlwhpvzsl4ssfagmsalys18s5c79ps30z7p"; @@ -13989,18 +15047,20 @@ let propagatedBuildInputs = [ ClassAccessor ListMoreUtils RegexpCommon SQLTokenizer ]; }; - SQLTokenizer = buildPerlPackage rec { - name = "SQL-Tokenizer-0.24"; + SQLTokenizer = buildPerlPackage { + pname = "SQL-Tokenizer"; + version = "0.24"; src = fetchurl { url = mirror://cpan/authors/id/I/IZ/IZUT/SQL-Tokenizer-0.24.tar.gz; sha256 = "1qa2dfbzdlr5qqdam9yn78z5w3al5r8577x06qan8wv58ay6ka7s"; }; }; - SQLTranslator = buildPerlPackage rec { - name = "SQL-Translator-0.11024"; + SQLTranslator = buildPerlPackage { + pname = "SQL-Translator"; + version = "0.11024"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; + url = mirror://cpan/authors/id/I/IL/ILMARI/SQL-Translator-0.11024.tar.gz; sha256 = "5bde9d6f67850089ef35a9296d6f53e5ee8e991438366b71477f3f27c1581bb1"; }; buildInputs = [ JSON TestDifferences TestException XMLWriter YAML ]; @@ -14012,7 +15072,8 @@ let }; PackageVariant = buildPerlPackage { - name = "Package-Variant-1.003002"; + pname = "Package-Variant"; + version = "1.003002"; src = fetchurl { url = mirror://cpan/authors/id/M/MS/MSTROUT/Package-Variant-1.003002.tar.gz; sha256 = "b2ed849d2f4cdd66467512daa3f143266d6df810c5fae9175b252c57bc1536dc"; @@ -14025,16 +15086,18 @@ let }; }; - SortNaturally = buildPerlPackage rec { - name = "Sort-Naturally-1.03"; + SortNaturally = buildPerlPackage { + pname = "Sort-Naturally"; + version = "1.03"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Sort-Naturally-1.03.tar.gz; sha256 = "eaab1c5c87575a7826089304ab1f8ffa7f18e6cd8b3937623e998e865ec1e746"; }; }; Starlet = buildPerlPackage { - name = "Starlet-0.31"; + pname = "Starlet"; + version = "0.31"; src = fetchurl { url = mirror://cpan/authors/id/K/KA/KAZUHO/Starlet-0.31.tar.gz; sha256 = "b9603b8e62880cb4582f6a7939eafec65e6efd3d900f2c7dd342e5f4c68d62d8"; @@ -14047,17 +15110,17 @@ let }; }; - Starman = let version = "0.4014"; in buildPerlModule { - name = "Starman-${version}"; + Starman = buildPerlModule { + pname = "Starman"; + version = "0.4014"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-${version}.tar.gz"; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4014.tar.gz"; sha256 = "1sbb5rb3vs82rlh1fjkgkcmj5pj62b4y9si4ihh45sl9m8c2qxx5"; }; buildInputs = [ LWP ModuleBuildTiny TestRequires TestTCP ]; propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack ]; doCheck = false; # binds to various TCP ports meta = { - inherit version; homepage = https://github.com/miyagawa/Starman; description = "High-performance preforking PSGI/Plack web server"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -14065,7 +15128,8 @@ let }; StatisticsBasic = buildPerlPackage { - name = "Statistics-Basic-1.6611"; + pname = "Statistics-Basic"; + version = "1.6611"; src = fetchurl { url = mirror://cpan/authors/id/J/JE/JETTERO/Statistics-Basic-1.6611.tar.gz; sha256 = "1ywl398z42hz9w1k0waf1caa6agz8jzsjlf4rzs1lgpx2mbcwmb8"; @@ -14077,7 +15141,8 @@ let }; StatisticsCaseResampling = buildPerlPackage { - name = "Statistics-CaseResampling-0.15"; + pname = "Statistics-CaseResampling"; + version = "0.15"; src = fetchurl { url = mirror://cpan/authors/id/S/SM/SMUELLER/Statistics-CaseResampling-0.15.tar.gz; sha256 = "11whlh2dl7l6wrrnfmpbsg7ldcn316iccl1aaa4j5lqhdyyl6745"; @@ -14088,7 +15153,8 @@ let }; StatisticsDescriptive = buildPerlModule { - name = "Statistics-Descriptive-3.0702"; + pname = "Statistics-Descriptive"; + version = "3.0702"; src = fetchurl { url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0702.tar.gz; sha256 = "f98a10c625640170cdda408cccc72bdd7f66f8ebe5f59dec1b96185171ef11d0"; @@ -14101,16 +15167,18 @@ let propagatedBuildInputs = [ ListMoreUtils ]; }; - StatisticsDistributions = buildPerlPackage rec { - name = "Statistics-Distributions-1.02"; + StatisticsDistributions = buildPerlPackage { + pname = "Statistics-Distributions"; + version = "1.02"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIKEK/Statistics-Distributions-1.02.tar.gz; sha256 = "1j1kswl98f4i9dn176f9aa3y9bissx2sscga5jm3gjl4pxm3k7zr"; }; }; - StatisticsTTest = buildPerlPackage rec { - name = "Statistics-TTest-1.1.0"; + StatisticsTTest = buildPerlPackage { + pname = "Statistics-TTest"; + version = "1.1.0"; src = fetchurl { url = mirror://cpan/authors/id/Y/YU/YUNFANG/Statistics-TTest-1.1.0.tar.gz; sha256 = "0rkifgzm4rappiy669dyi6lyxn2sdqaf0bl6gndlfa67b395kndj"; @@ -14119,7 +15187,8 @@ let }; Storable = buildPerlPackage { - name = "Storable-3.11"; + pname = "Storable"; + version = "3.11"; src = fetchurl { url = mirror://cpan/authors/id/X/XS/XSAWYERX/Storable-3.11.tar.gz; sha256 = "b2dac116d2f5adaf289e9a8a9bbac35cc2c24a9d2221fea9b6578a33b8ec7d28"; @@ -14130,7 +15199,8 @@ let }; StreamBuffered = buildPerlPackage { - name = "Stream-Buffered-0.03"; + pname = "Stream-Buffered"; + version = "0.03"; src = fetchurl { url = mirror://cpan/authors/id/D/DO/DOY/Stream-Buffered-0.03.tar.gz; sha256 = "0fs2n9zw6isfkha2kbqrvl9mwg572x1x0jlfaps0qsyynn846bcv"; @@ -14142,8 +15212,9 @@ let }; }; - strictures = buildPerlPackage rec { - name = "strictures-2.000006"; + strictures = buildPerlPackage { + pname = "strictures"; + version = "2.000006"; src = fetchurl { url = mirror://cpan/authors/id/H/HA/HAARG/strictures-2.000006.tar.gz; sha256 = "0mwd9xqz4n8qfpi5h5581lbm33qhf7agww18h063icnilrs7km89"; @@ -14155,24 +15226,27 @@ let }; }; - StringApprox = buildPerlPackage rec { - name = "String-Approx-3.28"; + StringApprox = buildPerlPackage { + pname = "String-Approx"; + version = "3.28"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHI/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JH/JHI/String-Approx-3.28.tar.gz; sha256 = "43201e762d8699cb0ac2c0764a5454bdc2306c0771014d6c8fba821480631342"; }; }; - StringCamelCase = buildPerlPackage rec { - name = "String-CamelCase-0.04"; + StringCamelCase = buildPerlPackage { + pname = "String-CamelCase"; + version = "0.04"; src = fetchurl { url = mirror://cpan/authors/id/H/HI/HIO/String-CamelCase-0.04.tar.gz; sha256 = "1a8i4yzv586svd0pbxls7642vvmyiwzh4x2xyij8gbnfxsydxhw9"; }; }; - StringCRC32 = buildPerlPackage rec { - name = "String-CRC32-1.7"; + StringCRC32 = buildPerlPackage { + pname = "String-CRC32"; + version = "1.7"; src = fetchurl { url = mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-1.7.tar.gz; sha256 = "1j1bwbxcgxfbgw708rfrni3spwnnmnf717vq9s64nd63jmc4w5lg"; @@ -14180,7 +15254,8 @@ let }; StringErrf = buildPerlPackage { - name = "String-Errf-0.008"; + pname = "String-Errf"; + version = "0.008"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/String-Errf-0.008.tar.gz; sha256 = "1nyn9s52jgbffrsv0m7rhcx1awjj43n68bfjlap8frdc7mw6y4xf"; @@ -14193,18 +15268,20 @@ let }; }; - StringEscape = buildPerlPackage rec { - name = "String-Escape-2010.002"; + StringEscape = buildPerlPackage { + pname = "String-Escape"; + version = "2010.002"; src = fetchurl { url = mirror://cpan/authors/id/E/EV/EVO/String-Escape-2010.002.tar.gz; sha256 = "12ls7f7847i4qcikkp3skwraqvjphjiv2zxfhl5d49326f5myr7x"; }; }; - StringFlogger = buildPerlPackage rec { - name = "String-Flogger-1.101245"; + StringFlogger = buildPerlPackage { + pname = "String-Flogger"; + version = "1.101245"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101245.tar.gz; sha256 = "aa03c08e01f802a358c175c6093c02adf9688659a087a8ddefdc3e9cef72640b"; }; propagatedBuildInputs = [ JSONMaybeXS SubExporter ]; @@ -14215,8 +15292,9 @@ let }; }; - StringFormat = buildPerlPackage rec { - name = "String-Format-1.18"; + StringFormat = buildPerlPackage { + pname = "String-Format"; + version = "1.18"; src = fetchurl { url = mirror://cpan/authors/id/S/SR/SREZIC/String-Format-1.18.tar.gz; sha256 = "0y77frxzjifd4sw0j19cc346ysas1mya84rdxaz279lyin7plhcy"; @@ -14224,7 +15302,8 @@ let }; StringFormatter = buildPerlPackage { - name = "String-Formatter-0.102084"; + pname = "String-Formatter"; + version = "0.102084"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-0.102084.tar.gz; sha256 = "0mlwm0rirv46gj4h072q8gdync5zxxsxy8p028gdyrhczl942dc3"; @@ -14237,23 +15316,26 @@ let }; StringMkPasswd = buildPerlPackage { - name = "String-MkPasswd-0.05"; + pname = "String-MkPasswd"; + version = "0.05"; src = fetchurl { url = mirror://cpan/authors/id/C/CG/CGRAU/String-MkPasswd-0.05.tar.gz; sha256 = "15lvcc8c9hp6mg3jx02wd3b85aphn8yl5db62q3pam04c0sgh42k"; }; }; - StringRandom = buildPerlModule rec { - name = "String-Random-0.30"; + StringRandom = buildPerlModule { + pname = "String-Random"; + version = "0.30"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/String-Random-0.30.tar.gz; sha256 = "06xdpyjc53al0a4ib2lw1m388v41z97hzqbdkd00w3nmjsdrn4w1"; }; }; StringRewritePrefix = buildPerlPackage { - name = "String-RewritePrefix-0.007"; + pname = "String-RewritePrefix"; + version = "0.007"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/String-RewritePrefix-0.007.tar.gz; sha256 = "18nxl1vgkcx0r7ifkmbl9fp73f8ihiqhqqf3vq6sj5b3cgawrfsw"; @@ -14266,7 +15348,8 @@ let }; StringShellQuote = buildPerlPackage { - name = "String-ShellQuote-1.04"; + pname = "String-ShellQuote"; + version = "1.04"; src = fetchurl { url = mirror://cpan/authors/id/R/RO/ROSCH/String-ShellQuote-1.04.tar.gz; sha256 = "0dfxhr6hxc2majkkrm0qbx3qcbykzpphbj2ms93dc86f7183c1p6"; @@ -14278,24 +15361,27 @@ let }; ShellCommand = buildPerlPackage { - name = "Shell-Command-0.06"; + pname = "Shell-Command"; + version = "0.06"; src = fetchurl { url = mirror://cpan/authors/id/F/FL/FLORA/Shell-Command-0.06.tar.gz; sha256 = "1lgc2rb3b5a4lxvbq0cbg08qk0n2i88srxbsz93bwi3razpxxr7k"; }; }; - StringToIdentifierEN = buildPerlPackage rec { - name = "String-ToIdentifier-EN-0.12"; + StringToIdentifierEN = buildPerlPackage { + pname = "String-ToIdentifier-EN"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RK/RKITOVER/String-ToIdentifier-EN-0.12.tar.gz; sha256 = "12nw7h2yiybhdw0vnnpc7bif8ylhsn6kqf6s39dsrf9h54iq9yrs"; }; propagatedBuildInputs = [ LinguaENInflectPhrase TextUnidecode namespaceclean ]; }; StringTruncate = buildPerlPackage { - name = "String-Truncate-1.100602"; + pname = "String-Truncate"; + version = "1.100602"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100602.tar.gz; sha256 = "0vjz4fd4cvcy12gk5bdha7z73ifmfpmk748khha94dhiq3pd98xa"; @@ -14308,7 +15394,8 @@ let }; StringTT = buildPerlPackage { - name = "String-TT-0.03"; + pname = "String-TT"; + version = "0.03"; src = fetchurl { url = mirror://cpan/authors/id/B/BO/BOBTFISH/String-TT-0.03.tar.gz; sha256 = "1asjr79wqcl9wk96afxrm1yhpj8lk9bk8kyz78yi5ypr0h55yq7p"; @@ -14321,14 +15408,14 @@ let }; }; - StringUtil = let version = "1.26"; in buildPerlModule { - name = "String-Util-${version}"; + StringUtil = buildPerlModule { + pname = "String-Util"; + version = "1.26"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIKO/String-Util-${version}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIKO/String-Util-1.26.tar.gz; sha256 = "0bgs6fsc0gcj9qa1k98nwjp4xbkl3ckz71rz3qhmav0lgkrr96pl"; }; meta = { - inherit version; description = "String::Util -- String processing utilities"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -14337,7 +15424,7 @@ let }; strip-nondeterminism = buildPerlPackage rec { - name = "strip-nondeterminism-${version}"; + pname = "strip-nondeterminism"; version = "1.0.0"; outputs = [ "out" "dev" ]; # no "devdoc" @@ -14369,7 +15456,8 @@ let }; SubExporter = buildPerlPackage { - name = "Sub-Exporter-0.987"; + pname = "Sub-Exporter"; + version = "0.987"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.987.tar.gz; sha256 = "1ml3n1ck4ln9qjm2mcgkczj1jb5n1fkscz9c4x23v4db0glb4g2l"; @@ -14382,10 +15470,11 @@ let }; }; - SubExporterForMethods = buildPerlPackage rec { - name = "Sub-Exporter-ForMethods-0.100052"; + SubExporterForMethods = buildPerlPackage { + pname = "Sub-Exporter-ForMethods"; + version = "0.100052"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100052.tar.gz; sha256 = "421fbba4f6ffcf13c4335f2c20630d709e6fa659c07545d094dbc5a558ad3006"; }; buildInputs = [ namespaceautoclean ]; @@ -14398,7 +15487,8 @@ let }; SubExporterGlobExporter = buildPerlPackage { - name = "Sub-Exporter-GlobExporter-0.005"; + pname = "Sub-Exporter-GlobExporter"; + version = "0.005"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-GlobExporter-0.005.tar.gz; sha256 = "0qvsvfvfyk69v2ygjnyd5sh3bgbzd6f7k7mgv0zws1yywvpmxi1g"; @@ -14412,7 +15502,8 @@ let }; SubExporterProgressive = buildPerlPackage { - name = "Sub-Exporter-Progressive-0.001013"; + pname = "Sub-Exporter-Progressive"; + version = "0.001013"; src = fetchurl { url = mirror://cpan/authors/id/F/FR/FREW/Sub-Exporter-Progressive-0.001013.tar.gz; sha256 = "0mn0x8mkh36rrsr58s1pk4srwxh2hbwss7sv630imnk49navfdfm"; @@ -14423,10 +15514,11 @@ let }; }; - SubIdentify = buildPerlPackage rec { - name = "Sub-Identify-0.14"; + SubIdentify = buildPerlPackage { + pname = "Sub-Identify"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RG/RGARCIA/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RG/RGARCIA/Sub-Identify-0.14.tar.gz; sha256 = "068d272086514dd1e842b6a40b1bedbafee63900e5b08890ef6700039defad6f"; }; meta = { @@ -14435,10 +15527,11 @@ let }; }; - SubInfo = buildPerlPackage rec { - name = "Sub-Info-0.002"; + SubInfo = buildPerlPackage { + pname = "Sub-Info"; + version = "0.002"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Sub-Info-0.002.tar.gz; sha256 = "ea3056d696bdeff21a99d340d5570887d39a8cc47bff23adfc82df6758cdd0ea"; }; propagatedBuildInputs = [ Importer ]; @@ -14449,7 +15542,8 @@ let }; SubInstall = buildPerlPackage { - name = "Sub-Install-0.928"; + pname = "Sub-Install"; + version = "0.928"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.928.tar.gz; sha256 = "03zgk1yh128gciyx3q77zxzxg9kf8yy2gm46gdxqi24mcykngrb1"; @@ -14460,10 +15554,11 @@ let }; }; - SubName = buildPerlPackage rec { - name = "Sub-Name-0.21"; + SubName = buildPerlPackage { + pname = "Sub-Name"; + version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/Sub-Name-0.21.tar.gz; sha256 = "bd32e9dee07047c10ae474c9f17d458b6e9885a6db69474c7a494ccc34c27117"; }; buildInputs = [ BC DevelCheckBin ]; @@ -14474,19 +15569,21 @@ let }; }; - SubOverride = buildPerlPackage rec { - name = "Sub-Override-0.09"; + SubOverride = buildPerlPackage { + pname = "Sub-Override"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz"; + url = mirror://cpan/authors/id/O/OV/OVID/Sub-Override-0.09.tar.gz; sha256 = "1d955qn44brkcfif3gi0q2vvvqahny6rax0vr068x5i9yz0ng6lk"; }; buildInputs = [ TestFatal ]; }; - SubQuote = buildPerlPackage rec { - name = "Sub-Quote-2.006003"; + SubQuote = buildPerlPackage { + pname = "Sub-Quote"; + version = "2.006003"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; + url = mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.006003.tar.gz; sha256 = "be1f3a6f773f351f203cdc8f614803ac492b77d15fd68d5b1f0cd3884be18176"; }; buildInputs = [ TestFatal ]; @@ -14497,7 +15594,8 @@ let }; SubUplevel = buildPerlPackage { - name = "Sub-Uplevel-0.2800"; + pname = "Sub-Uplevel"; + version = "0.2800"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.2800.tar.gz; sha256 = "14z2xjiw931wizcx3mblmby753jspvfm321d6chs907nh0xzdwxl"; @@ -14509,19 +15607,21 @@ let }; }; - SVNSimple = buildPerlPackage rec { - name = "SVN-Simple-0.28"; + SVNSimple = buildPerlPackage { + pname = "SVN-Simple"; + version = "0.28"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CL/CLKAO/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CL/CLKAO/SVN-Simple-0.28.tar.gz; sha256 = "1ysgi38zx236cxz539k6d6rw5z0vc70rrglsaf5fk6rnwilw2g6n"; }; propagatedBuildInputs = [ (pkgs.subversionClient.override { inherit perl; }) ]; }; - Swim = buildPerlPackage rec { - name = "Swim-0.1.46"; + Swim = buildPerlPackage { + pname = "Swim"; + version = "0.1.46"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; + url = mirror://cpan/authors/id/I/IN/INGY/Swim-0.1.46.tar.gz; sha256 = "ac747362afec12a0ba30ffdfff8765f80a124dff8ebcb238326fa627e07daae8"; }; buildInputs = [ FileShareDirInstall ]; @@ -14533,8 +15633,9 @@ let }; }; - Switch = buildPerlPackage rec { - name = "Switch-2.17"; + Switch = buildPerlPackage { + pname = "Switch"; + version = "2.17"; src = fetchurl { url = "mirror://cpan/authors/id/C/CH/CHORNY/Switch-2.17.tar.gz"; sha256 = "0xbdjdgzfj9zwa4j3ipr8bfk7bcici4hk89hq5d27rhg2isljd9i"; @@ -14543,7 +15644,8 @@ let }; SymbolGlobalName = buildPerlPackage { - name = "Symbol-Global-Name-0.05"; + pname = "Symbol-Global-Name"; + version = "0.05"; src = fetchurl { url = mirror://cpan/authors/id/A/AL/ALEXMV/Symbol-Global-Name-0.05.tar.gz; sha256 = "0f7623e9d724760aa64040222da1d82f1188586791329261cc60dad1d60d6a92"; @@ -14555,7 +15657,8 @@ let }; SymbolUtil = buildPerlModule { - name = "Symbol-Util-0.0203"; + pname = "Symbol-Util"; + version = "0.0203"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Symbol-Util-0.0203.tar.gz; sha256 = "0cnwwrd5d6i80f33s7n2ak90rh4s53ss7q57wndrpkpr4bfn3djm"; @@ -14563,7 +15666,8 @@ let }; syntax = buildPerlPackage { - name = "syntax-0.004"; + pname = "syntax"; + version = "0.004"; src = fetchurl { url = mirror://cpan/authors/id/P/PH/PHAYLON/syntax-0.004.tar.gz; sha256 = "fe19b6da8a8f43a5aa2ee571441bc0e339fb156d0081c157a1a24e9812c7d365"; @@ -14576,10 +15680,11 @@ let }; }; - SyntaxKeywordJunction = buildPerlPackage rec { - name = "Syntax-Keyword-Junction-0.003008"; + SyntaxKeywordJunction = buildPerlPackage { + pname = "Syntax-Keyword-Junction"; + version = "0.003008"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FR/FREW/Syntax-Keyword-Junction-0.003008.tar.gz; sha256 = "8b4975f21b1992a7e6c2df5dcc92b254c61925595eddcdfaf0b1498717aa95ef"; }; buildInputs = [ TestRequires ]; @@ -14591,10 +15696,11 @@ let }; }; - SysMmap = buildPerlPackage rec { - name = "Sys-Mmap-0.19"; + SysMmap = buildPerlPackage { + pname = "Sys-Mmap"; + version = "0.19"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SW/SWALTERS/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SW/SWALTERS/Sys-Mmap-0.19.tar.gz; sha256 = "1yh0170xfw3z7n3lynffcb6axv7wi6zb46cx03crj1cvrhjmwa89"; }; meta = with stdenv.lib; { @@ -14604,10 +15710,11 @@ let }; }; - SysMemInfo = buildPerlPackage rec { - name = "Sys-MemInfo-0.99"; + SysMemInfo = buildPerlPackage { + pname = "Sys-MemInfo"; + version = "0.99"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SC/SCRESTO/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SC/SCRESTO/Sys-MemInfo-0.99.tar.gz; sha256 = "0786319d3a3a8bae5d727939244bf17e140b714f52734d5e9f627203e4cf3e3b"; }; meta = { @@ -14617,26 +15724,29 @@ let }; }; - SysCPU = buildPerlPackage rec { - name = "Sys-CPU-0.61"; + SysCPU = buildPerlPackage { + pname = "Sys-CPU"; + version = "0.61"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MZ/MZSANFORD/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MZ/MZSANFORD/Sys-CPU-0.61.tar.gz; sha256 = "1r6976bs86j7zp51m5vh42xlyah951jgdlkimv202413kjvqc2i5"; }; buildInputs = stdenv.lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Carbon; }; - SysHostnameLong = buildPerlPackage rec { - name = "Sys-Hostname-Long-1.5"; + SysHostnameLong = buildPerlPackage { + pname = "Sys-Hostname-Long"; + version = "1.5"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SC/SCOTT/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SC/SCOTT/Sys-Hostname-Long-1.5.tar.gz; sha256 = "1jv5n8jv48c1p8svjsigyxndv1ygsq8wgwj9c7ypx1vaf3rns679"; }; doCheck = false; # no `hostname' in stdenv }; SysSigAction = buildPerlPackage { - name = "Sys-SigAction-0.23"; + pname = "Sys-SigAction"; + version = "0.23"; src = fetchurl { url = mirror://cpan/authors/id/L/LB/LBAXTER/Sys-SigAction-0.23.tar.gz; sha256 = "c4ef6c9345534031fcbbe2adc347fc7194d47afc945e7a44fac7e9563095d353"; @@ -14648,10 +15758,11 @@ let }; }; - SysSyslog = buildPerlPackage rec { - name = "Sys-Syslog-0.35"; + SysSyslog = buildPerlPackage { + pname = "Sys-Syslog"; + version = "0.35"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SAPER/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SA/SAPER/Sys-Syslog-0.35.tar.gz; sha256 = "fe28e47b70b77aaae754385fe1470d174289e7b6908efa247d2e52486516fbb7"; }; meta = { @@ -14660,10 +15771,11 @@ let }; }; - SystemCommand = buildPerlPackage rec { - name = "System-Command-1.119"; + SystemCommand = buildPerlPackage { + pname = "System-Command"; + version = "1.119"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOOK/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BO/BOOK/System-Command-1.119.tar.gz; sha256 = "c8c9fb1e527c52463cab1476500efea70396a0b62bea625d2d6faea994dc46e7"; }; propagatedBuildInputs = [ IPCRun ]; @@ -14674,8 +15786,8 @@ let }; SysVirt = buildPerlModule rec { + pname = "Sys-Virt"; version = "4.10.0"; - name = "Sys-Virt-${version}"; src = assert version == pkgs.libvirt.version; pkgs.fetchgit { url = git://libvirt.org/libvirt-perl.git; rev = "v${version}"; @@ -14685,10 +15797,11 @@ let buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; }; - TAPParserSourceHandlerpgTAP = buildPerlModule rec { - name = "TAP-Parser-SourceHandler-pgTAP-3.35"; + TAPParserSourceHandlerpgTAP = buildPerlModule { + pname = "TAP-Parser-SourceHandler-pgTAP"; + version = "3.35"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.35.tar.gz; sha256 = "1655337l1cyd7q62007wrk87q2gbbwfq9xjy1wgx3hyflxpkkvl4"; }; doCheck = !stdenv.isDarwin; @@ -14698,10 +15811,11 @@ let }; }; - TaskCatalystTutorial = buildPerlPackage rec { - name = "Task-Catalyst-Tutorial-0.06"; + TaskCatalystTutorial = buildPerlPackage { + pname = "Task-Catalyst-Tutorial"; + version = "0.06"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MR/MRAMBERG/Task-Catalyst-Tutorial-0.06.tar.gz; sha256 = "75b1b2d96155647842587146cefd0de30943b85195e8e3eca51e0f0b8642d61e"; }; propagatedBuildInputs = [ CatalystAuthenticationStoreDBIxClass CatalystControllerHTMLFormFu CatalystDevel CatalystManual CatalystPluginAuthorizationACL CatalystPluginAuthorizationRoles CatalystPluginSessionStateCookie CatalystPluginSessionStoreFastMmap CatalystPluginStackTrace CatalystViewTT ]; @@ -14712,8 +15826,9 @@ let doCheck = false; /* fails with 'open3: exec of .. perl .. failed: Argument list too long at .../TAP/Parser/Iterator/Process.pm line 165.' */ }; - TaskFreecellSolverTesting = buildPerlModule rec { - name = "Task-FreecellSolver-Testing-0.0.11"; + TaskFreecellSolverTesting = buildPerlModule { + pname = "Task-FreecellSolver-Testing"; + version = "0.0.11"; src = fetchurl { url = mirror://cpan/authors/id/S/SH/SHLOMIF/Task-FreecellSolver-Testing-v0.0.11.tar.gz; sha256 = "a2f73c65d0e5676cf4aae213ba4c3f88bf85f084a2165f1e71e3ce5b19023206"; @@ -14726,20 +15841,22 @@ let }; }; - TaskPlack = buildPerlModule rec { - name = "Task-Plack-0.28"; + TaskPlack = buildPerlModule { + pname = "Task-Plack"; + version = "0.28"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Task-Plack-0.28.tar.gz; sha256 = "0ajwkyr9nwn11afi6fz6kx4bi7a3p8awjsldmsakz3sl0s42pmbr"; }; propagatedBuildInputs = [ CGICompile CGIEmulatePSGI CGIPSGI Corona FCGI FCGIClient FCGIProcManager HTTPServerSimplePSGI IOHandleUtil NetFastCGI PSGI PlackAppProxy PlackMiddlewareAuthDigest PlackMiddlewareConsoleLogger PlackMiddlewareDebug PlackMiddlewareDeflater PlackMiddlewareHeader PlackMiddlewareReverseProxy PlackMiddlewareSession Starlet Starman Twiggy ]; buildInputs = [ ModuleBuildTiny TestSharedFork ]; }; - TaskTestRunAllPlugins = buildPerlModule rec { - name = "Task-Test-Run-AllPlugins-0.0105"; + TaskTestRunAllPlugins = buildPerlModule { + pname = "Task-Test-Run-AllPlugins"; + version = "0.0105"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Task-Test-Run-AllPlugins-0.0105.tar.gz; sha256 = "fd43bd053aa884a5abca851f145a0e29898515dcbfc3512f18cd0d86d28eb0a9"; }; buildInputs = [ TestRun TestRunCmdLine TestRunPluginAlternateInterpreters TestRunPluginBreakOnFailure TestRunPluginColorFileVerdicts TestRunPluginColorSummary TestRunPluginTrimDisplayedFilenames ]; @@ -14751,7 +15868,8 @@ let }; TaskWeaken = buildPerlPackage { - name = "Task-Weaken-1.06"; + pname = "Task-Weaken"; + version = "1.06"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Task-Weaken-1.06.tar.gz; sha256 = "1gk6rmnp4x50lzr0vfng41khf0f8yzxlm0pad1j69vxskpdzx0r3"; @@ -14763,7 +15881,8 @@ let }; TemplatePluginAutoformat = buildPerlPackage { - name = "Template-Plugin-Autoformat-2.77"; + pname = "Template-Plugin-Autoformat"; + version = "2.77"; src = fetchurl { url = mirror://cpan/authors/id/K/KA/KARMAN/Template-Plugin-Autoformat-2.77.tar.gz; sha256 = "bddfb4919f0abb2a2be7a9665333e0d4e098032f0e383dbaf04c4d896c7486ed"; @@ -14777,7 +15896,8 @@ let }; TemplatePluginClass = buildPerlPackage { - name = "Template-Plugin-Class-0.14"; + pname = "Template-Plugin-Class"; + version = "0.14"; src = fetchurl { url = mirror://cpan/authors/id/R/RC/RCLAMP/Template-Plugin-Class-0.14.tar.gz; sha256 = "1hq7jy6zg1iaslsyi05afz0i944y9jnv3nb4krkxjfmzwy5gw106"; @@ -14786,7 +15906,8 @@ let }; TemplatePluginIOAll = buildPerlPackage { - name = "Template-Plugin-IO-All-0.01"; + pname = "Template-Plugin-IO-All"; + version = "0.01"; src = fetchurl { url = mirror://cpan/authors/id/X/XE/XERN/Template-Plugin-IO-All-0.01.tar.gz; sha256 = "1f7445422a21932e09bbef935766e0af6b7cceb088e9d8e030cd7a84bcdc5ee4"; @@ -14800,7 +15921,8 @@ let }; TemplatePluginJavaScript = buildPerlPackage { - name = "Template-Plugin-JavaScript-0.02"; + pname = "Template-Plugin-JavaScript"; + version = "0.02"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Template-Plugin-JavaScript-0.02.tar.gz; sha256 = "1mqqqs0dhfr6bp1305j9ns05q4pq1n3f561l6p8848k5ml3dh87a"; @@ -14809,7 +15931,8 @@ let }; TemplatePluginJSONEscape = buildPerlPackage { - name = "Template-Plugin-JSON-Escape-0.02"; + pname = "Template-Plugin-JSON-Escape"; + version = "0.02"; src = fetchurl { url = mirror://cpan/authors/id/N/NA/NANTO/Template-Plugin-JSON-Escape-0.02.tar.gz; sha256 = "051a8b1d3bc601d58fc51e246067d36450cfe970278a0456e8ab61940f13cd86"; @@ -14818,7 +15941,8 @@ let }; TemplateTimer = buildPerlPackage { - name = "Template-Timer-1.00"; + pname = "Template-Timer"; + version = "1.00"; src = fetchurl { url = mirror://cpan/authors/id/P/PE/PETDANCE/Template-Timer-1.00.tar.gz; sha256 = "1d3pbcx1kz73ncg8s8lx3ifwphz838qy0m40gdar7790cnrlqcdp"; @@ -14831,7 +15955,8 @@ let }; TemplateTiny = buildPerlPackage { - name = "Template-Tiny-1.12"; + pname = "Template-Tiny"; + version = "1.12"; src = fetchurl { url = mirror://cpan/authors/id/A/AD/ADAMK/Template-Tiny-1.12.tar.gz; sha256 = "073e062c630b51dfb725cd6485a329155cb72d5c596e8cb698eb67c4566f0a4a"; @@ -14842,8 +15967,9 @@ let }; }; - TemplateToolkit = buildPerlPackage rec { - name = "Template-Toolkit-2.28"; + TemplateToolkit = buildPerlPackage { + pname = "Template-Toolkit"; + version = "2.28"; src = fetchurl { url = mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-2.28.tar.gz; sha256 = "1msxg3j1hx5wsc7vr81x5gs9gdbn4y0x6cvyj3pq4dgi1603dbvi"; @@ -14857,8 +15983,9 @@ let buildInputs = [ CGI TestLeakTrace ]; }; - TemplateGD = buildPerlPackage rec { - name = "Template-GD-2.66"; + TemplateGD = buildPerlPackage { + pname = "Template-GD"; + version = "2.66"; src = fetchurl { url = mirror://cpan/authors/id/A/AB/ABW/Template-GD-2.66.tar.gz; sha256 = "98523c8192f2e8184042e5a2e172bd767ac289dd2e480f35f680dce32160905b"; @@ -14871,7 +15998,8 @@ let }; TermEncoding = buildPerlPackage { - name = "Term-Encoding-0.03"; + pname = "Term-Encoding"; + version = "0.03"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Term-Encoding-0.03.tar.gz; sha256 = "95ba9687d735d25a3cbe64508d7894f009c7fa2a1726c3e786e9e21da2251d0b"; @@ -14882,10 +16010,11 @@ let }; }; - TermProgressBar = buildPerlPackage rec { - name = "Term-ProgressBar-2.22"; + TermProgressBar = buildPerlPackage { + pname = "Term-ProgressBar"; + version = "2.22"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MANWAR/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MANWAR/Term-ProgressBar-2.22.tar.gz; sha256 = "2642ecca5b0b038c14812bcad3a9611ff7911dc59c9104d220797f837a880c49"; }; buildInputs = [ CaptureTiny TestException TestWarnings ]; @@ -14897,7 +16026,8 @@ let }; TermProgressBarQuiet = buildPerlPackage { - name = "Term-ProgressBar-Quiet-0.31"; + pname = "Term-ProgressBar-Quiet"; + version = "0.31"; src = fetchurl { url = mirror://cpan/authors/id/L/LB/LBROCARD/Term-ProgressBar-Quiet-0.31.tar.gz; sha256 = "25675292f588bc29d32e710cf3667da9a2a1751e139801770a9fdb18cd2184a6"; @@ -14911,7 +16041,8 @@ let }; TermProgressBarSimple = buildPerlPackage { - name = "Term-ProgressBar-Simple-0.03"; + pname = "Term-ProgressBar-Simple"; + version = "0.03"; src = fetchurl { url = mirror://cpan/authors/id/E/EV/EVDB/Term-ProgressBar-Simple-0.03.tar.gz; sha256 = "a20db3c67d5bdfd0c1fab392c6d1c26880a7ee843af602af4f9b53a7043579a6"; @@ -14920,35 +16051,37 @@ let buildInputs = [ TestMockObject ]; }; - TermReadKey = buildPerlPackage rec { - name = "TermReadKey-${version}"; + TermReadKey = let + cross = stdenv.hostPlatform != stdenv.buildPlatform; + in buildPerlPackage { + pname = "TermReadKey"; version = "2.38"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JS/JSTOWE/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JS/JSTOWE/TermReadKey-2.38.tar.gz; sha256 = "143jlibah1g14bym7sj3gphvqkpj1w4vn7sqc4vc62jpviw5hr2s"; }; - cross = stdenv.hostPlatform != stdenv.buildPlatform; # use native libraries from the host when running build commands - postConfigure = if cross then let + postConfigure = stdenv.lib.optionalString cross (let host_perl = buildPerl; host_self = buildPerl.pkgs.TermReadKey; perl_lib = "${host_perl}/lib/perl5/${host_perl.version}"; self_lib = "${host_self}/lib/perl5/site_perl/${host_perl.version}"; in '' sed -ie 's|"-I$(INST_ARCHLIB)"|"-I${perl_lib}" "-I${self_lib}"|g' Makefile - '' else null; + ''); # TermReadKey uses itself in the build process - nativeBuildInputs = if cross then [ + nativeBuildInputs = stdenv.lib.optionals cross [ buildPerl.pkgs.TermReadKey - ] else []; + ]; }; - TermReadLineGnu = buildPerlPackage rec { - name = "Term-ReadLine-Gnu-1.36"; + TermReadLineGnu = buildPerlPackage { + pname = "Term-ReadLine-Gnu"; + version = "1.36"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAYASHI/${name}.tar.gz"; + url = mirror://cpan/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.36.tar.gz; sha256 = "9a08f7a4013c9b865541c10dbba1210779eb9128b961250b746d26702bab6925"; }; buildInputs = [ pkgs.readline pkgs.ncurses ]; @@ -14975,8 +16108,9 @@ let }; }; - TermReadLineTTYtter = buildPerlPackage rec { - name = "Term-ReadLine-TTYtter-1.4"; + TermReadLineTTYtter = buildPerlPackage { + pname = "Term-ReadLine-TTYtter"; + version = "1.4"; src = fetchurl { url = "mirror://cpan/authors/id/C/CK/CKAISER/Term-ReadLine-TTYtter-1.4.tar.gz"; sha256 = "14xcqhg1vrwgv65nd2z8xzn0wgb18i17pzkkh8m15cp1rqrk2dxc"; @@ -14990,10 +16124,11 @@ let }; }; - TermShell = buildPerlModule rec { - name = "Term-Shell-0.10"; + TermShell = buildPerlModule { + pname = "Term-Shell"; + version = "0.10"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Term-Shell-0.10.tar.gz; sha256 = "7d1f824c2db22769b60000b5b9ca2ad469c154939f9ec1cd3f0e06e9c967dda3"; }; propagatedBuildInputs = [ TermReadKey TextAutoformat ]; @@ -15004,16 +16139,18 @@ let }; }; - TermShellUI = buildPerlPackage rec { - name = "Term-ShellUI-0.92"; + TermShellUI = buildPerlPackage { + pname = "Term-ShellUI"; + version = "0.92"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BR/BRONSON/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BR/BRONSON/Term-ShellUI-0.92.tar.gz; sha256 = "3279c01c76227335eeff09032a40f4b02b285151b3576c04cacd15be05942bdb"; }; }; TermSizeAny = buildPerlPackage { - name = "Term-Size-Any-0.002"; + pname = "Term-Size-Any"; + version = "0.002"; src = fetchurl { url = mirror://cpan/authors/id/F/FE/FERREIRA/Term-Size-Any-0.002.tar.gz; sha256 = "64fa5fdb1ae3a823134aaa95aec75354bc17bdd9ca12ba0a7ae34a7e51b3ded2"; @@ -15026,7 +16163,8 @@ let }; TermSizePerl = buildPerlPackage { - name = "Term-Size-Perl-0.031"; + pname = "Term-Size-Perl"; + version = "0.031"; src = fetchurl { url = mirror://cpan/authors/id/F/FE/FERREIRA/Term-Size-Perl-0.031.tar.gz; sha256 = "ae9a6746cb1b305ddc8f8d8ca46878552b9c1123628971e13a275183822f209e"; @@ -15037,10 +16175,11 @@ let }; }; - TermTable = buildPerlPackage rec { - name = "Term-Table-0.013"; + TermTable = buildPerlPackage { + pname = "Term-Table"; + version = "0.013"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Term-Table-0.013.tar.gz; sha256 = "ffeb36dcb25c575b9f63657d1591a14af22cd10ba23cc76de9d976b426f4fc40"; }; propagatedBuildInputs = [ Importer ]; @@ -15050,8 +16189,9 @@ let }; }; - TermUI = buildPerlPackage rec { - name = "Term-UI-0.46"; + TermUI = buildPerlPackage { + pname = "Term-UI"; + version = "0.46"; src = fetchurl { url = mirror://cpan/authors/id/B/BI/BINGOS/Term-UI-0.46.tar.gz; sha256 = "19p92za5cx1v7g57pg993amprcvm1az3pp7y9g5b1aplsy06r54i"; @@ -15064,7 +16204,8 @@ let }; TermVT102 = buildPerlPackage { - name = "Term-VT102-0.91"; + pname = "Term-VT102"; + version = "0.91"; src = fetchurl { url = mirror://cpan/authors/id/A/AJ/AJWOOD/Term-VT102-0.91.tar.gz; sha256 = "f954e0310941d45c0fc3eb4a40f5d3a00d68119e277d303a1e6af11ded6fbd94"; @@ -15074,7 +16215,8 @@ let }; TermVT102Boundless = buildPerlPackage { - name = "Term-VT102-Boundless-0.05"; + pname = "Term-VT102-Boundless"; + version = "0.05"; src = fetchurl { url = mirror://cpan/authors/id/F/FB/FBARRIOS/Term-VT102-Boundless-0.05.tar.gz; sha256 = "e1ded85ae3d76b59c03b8697f4a6cb01ae31bd62a9354f5bb7d18f9e927b485f"; @@ -15082,10 +16224,11 @@ let propagatedBuildInputs = [ TermVT102 ]; }; - TermAnimation = buildPerlPackage rec { - name = "Term-Animation-2.6"; + TermAnimation = buildPerlPackage { + pname = "Term-Animation"; + version = "2.6"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KB/KBAUCOM/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KB/KBAUCOM/Term-Animation-2.6.tar.gz; sha256 = "7d5c3c2d4f9b657a8b1dce7f5e2cbbe02ada2e97c72f3a0304bf3c99d084b045"; }; propagatedBuildInputs = [ Curses ]; @@ -15095,8 +16238,9 @@ let }; }; - Test2PluginNoWarnings = buildPerlPackage rec { - name = "Test2-Plugin-NoWarnings-0.06"; + Test2PluginNoWarnings = buildPerlPackage { + pname = "Test2-Plugin-NoWarnings"; + version = "0.06"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.06.tar.gz; sha256 = "002qk6qsm0l6r2kaxywvc38w0yf0mlavgywq8li076pn6kcw3242"; @@ -15108,10 +16252,11 @@ let }; }; - Test2Suite = buildPerlPackage rec { - name = "Test2-Suite-0.000119"; + Test2Suite = buildPerlPackage { + pname = "Test2-Suite"; + version = "0.000119"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000119.tar.gz; sha256 = "fd48764118acf1c30057f58f0af90696b194fbc5b637c77e08672e949c101e74"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; @@ -15121,8 +16266,9 @@ let }; }; - TestAbortable = buildPerlPackage rec { - name = "Test-Abortable-0.002"; + TestAbortable = buildPerlPackage { + pname = "Test-Abortable"; + version = "0.002"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Abortable-0.002.tar.gz; sha256 = "0v97y31j56f4mxw0vxyjbdprq4951h4wcdh4acnfm63np7wvg44p"; @@ -15137,7 +16283,8 @@ let }; TestAssert = buildPerlModule { - name = "Test-Assert-0.0504"; + pname = "Test-Assert"; + version = "0.0504"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Test-Assert-0.0504.tar.gz; sha256 = "194bzflmzc0cw5727kznbj1zwzj7gnj7nx1643zk2hshdjlnv8yg"; @@ -15146,8 +16293,9 @@ let propagatedBuildInputs = [ ExceptionBase constantboolean ]; }; - TestAssertions = buildPerlPackage rec { - name = "Test-Assertions-1.054"; + TestAssertions = buildPerlPackage { + pname = "Test-Assertions"; + version = "1.054"; src = fetchurl { url = mirror://cpan/authors/id/B/BB/BBC/Test-Assertions-1.054.tar.gz; sha256 = "10026w4r3yv6k3vc6cby7d61mxddlqh0ls6z39c82f17awfy9p7w"; @@ -15155,10 +16303,11 @@ let propagatedBuildInputs = [ LogTrace ]; }; - TestAggregate = buildPerlModule rec { - name = "Test-Aggregate-0.375"; + TestAggregate = buildPerlModule { + pname = "Test-Aggregate"; + version = "0.375"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RW/RWSTAUNER/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Test-Aggregate-0.375.tar.gz; sha256 = "c6cc0abfd0d4fce85371acca93ec245381841d32b4caa2d6475e4bc8130427d1"; }; buildInputs = [ TestMost TestNoWarnings TestTrap ]; @@ -15170,10 +16319,11 @@ let }; - TestBase = buildPerlPackage rec { - name = "Test-Base-0.89"; + TestBase = buildPerlPackage { + pname = "Test-Base"; + version = "0.89"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; + url = mirror://cpan/authors/id/I/IN/INGY/Test-Base-0.89.tar.gz; sha256 = "056hibgg3i2b89mwr76vyxi6ayb3hqjqcwicvn3s5lximsma3517"; }; propagatedBuildInputs = [ Spiffy ]; @@ -15181,7 +16331,8 @@ let }; TestBits = buildPerlPackage { - name = "Test-Bits-0.02"; + pname = "Test-Bits"; + version = "0.02"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/Test-Bits-0.02.tar.gz; sha256 = "1hqbvqlkj3k9ys4zq3f1fl1y6crni8r0ynan673f49rs91b6z0m9"; @@ -15194,10 +16345,11 @@ let }; }; - TestCheckDeps = buildPerlPackage rec { - name = "Test-CheckDeps-0.010"; + TestCheckDeps = buildPerlPackage { + pname = "Test-CheckDeps"; + version = "0.010"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; + url = mirror://cpan/authors/id/L/LE/LEONT/Test-CheckDeps-0.010.tar.gz; sha256 = "1vjinlixxdx6gfcw8y1dw2rla8bfhi8nmgcqr3nffc7kqskcrz36"; }; propagatedBuildInputs = [ CPANMetaCheck ]; @@ -15207,10 +16359,11 @@ let }; }; - TestClass = buildPerlPackage rec { - name = "Test-Class-0.50"; + TestClass = buildPerlPackage { + pname = "Test-Class"; + version = "0.50"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-Class-0.50.tar.gz; sha256 = "099154ed8caf3ff97c71237fab952264ac1c03d9270737a56071cabe65991350"; }; buildInputs = [ TestException ]; @@ -15221,8 +16374,9 @@ let }; }; - TestClassMost = buildPerlModule rec { - name = "Test-Class-Most-0.08"; + TestClassMost = buildPerlModule { + pname = "Test-Class-Most"; + version = "0.08"; src = fetchurl { url = mirror://cpan/authors/id/O/OV/OVID/Test-Class-Most-0.08.tar.gz; sha256 = "1zvx9hil0mg0pnb8xfa4m0xgjpvh8s5gnbyprq3xwpdsdgcdwk33"; @@ -15235,7 +16389,8 @@ let }; TestCleanNamespaces = buildPerlPackage { - name = "Test-CleanNamespaces-0.24"; + pname = "Test-CleanNamespaces"; + version = "0.24"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.24.tar.gz; sha256 = "338d5569e8e89a654935f843ec0bc84aaa486fe8dd1898fb9cab3eccecd5327a"; @@ -15249,8 +16404,9 @@ let }; }; - TestCmd = buildPerlPackage rec { - name = "Test-Cmd-1.09"; + TestCmd = buildPerlPackage { + pname = "Test-Cmd"; + version = "1.09"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEILB/Test-Cmd-1.09.tar.gz; sha256 = "114nfafwfxxn7kig265b7lg0znb5ybvc282sjjwf14g7vpn20cyg"; @@ -15264,7 +16420,8 @@ let }; TestCommand = buildPerlModule { - name = "Test-Command-0.11"; + pname = "Test-Command"; + version = "0.11"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DANBOO/Test-Command-0.11.tar.gz; sha256 = "0cwm3c4d49mdrbm6vgh78b3x8mk730l0zg8i7xb9z8bkx9pzr8r8"; @@ -15276,8 +16433,9 @@ let }; }; - TestCompile = buildPerlModule rec { - name = "Test-Compile-1.3.0"; + TestCompile = buildPerlModule { + pname = "Test-Compile"; + version = "1.3.0"; src = fetchurl { url = mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v1.3.0.tar.gz; sha256 = "77527e9477ac5260443c756367a7f7bc3d8f6c6ebbc561b0b2fb3f79303bad33"; @@ -15290,7 +16448,8 @@ let }; TestCPANMeta = buildPerlPackage { - name = "Test-CPAN-Meta-0.25"; + pname = "Test-CPAN-Meta"; + version = "0.25"; src = fetchurl { url = mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-0.25.tar.gz; sha256 = "f55b4f9cf6bc396d0fe8027267685cb2ac4affce897d0967a317fac6db5a8db5"; @@ -15301,8 +16460,9 @@ let }; }; - TestCPANMetaJSON = buildPerlPackage rec { - name = "Test-CPAN-Meta-JSON-0.16"; + TestCPANMetaJSON = buildPerlPackage { + pname = "Test-CPAN-Meta-JSON"; + version = "0.16"; src = fetchurl { url = mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-JSON-0.16.tar.gz; sha256 = "1jg9ka50ixwq083wd4k12rhdjq87w0ihb34gd8jjn7gvvyd51b37"; @@ -15314,10 +16474,11 @@ let }; }; - TestDataSplit = buildPerlModule rec { - name = "Test-Data-Split-0.2.1"; + TestDataSplit = buildPerlModule { + pname = "Test-Data-Split"; + version = "0.2.1"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Data-Split-0.2.1.tar.gz; sha256 = "9ba0c27a9e23c5dd8ede7611a049180485acc512a63783e1d1843b6569db5ae7"; }; buildInputs = [ TestDifferences ]; @@ -15329,7 +16490,8 @@ let }; TestDeep = buildPerlPackage { - name = "Test-Deep-1.128"; + pname = "Test-Deep"; + version = "1.128"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.128.tar.gz; sha256 = "0bq9c0vrxbwhhy1pd2ss06fk06jal98j022mnyq6k0msdy1pwbc5"; @@ -15339,7 +16501,8 @@ let }; TestDir = buildPerlPackage { - name = "Test-Dir-1.16"; + pname = "Test-Dir"; + version = "1.16"; src = fetchurl { url = mirror://cpan/authors/id/M/MT/MTHURN/Test-Dir-1.16.tar.gz; sha256 = "7332b323913eb6a2684d094755196304b2f8606f70eaab913654ca91f273eac2"; @@ -15351,7 +16514,8 @@ let }; TestDifferences = buildPerlPackage { - name = "Test-Differences-0.67"; + pname = "Test-Differences"; + version = "0.67"; src = fetchurl { url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.67.tar.gz; sha256 = "c88dbbb48b934b069284874f33abbaaa438aa31204aa3fa73bfc2f4aeac878da"; @@ -15364,7 +16528,8 @@ let }; TestDistManifest = buildPerlModule { - name = "Test-DistManifest-1.014"; + pname = "Test-DistManifest"; + version = "1.014"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Test-DistManifest-1.014.tar.gz; sha256 = "3d26c20df42628981cbfcfa5b1ca028c6ceadb344c1dcf97a25ad6a88b73d7c5"; @@ -15378,7 +16543,8 @@ let }; TestEOL = buildPerlPackage { - name = "Test-EOL-2.00"; + pname = "Test-EOL"; + version = "2.00"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Test-EOL-2.00.tar.gz; sha256 = "0l3bxpsw0x7j9nclizcp53mnf9wny25dmg2iglfhzgnk0xfpwzwf"; @@ -15389,8 +16555,9 @@ let }; }; - TestException = buildPerlPackage rec { - name = "Test-Exception-0.43"; + TestException = buildPerlPackage { + pname = "Test-Exception"; + version = "0.43"; src = fetchurl { url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Exception-0.43.tar.gz; sha256 = "0cxm7s4bg0xpxa6l6996a6iq3brr4j7p4hssnkc6dxv4fzq16sqm"; @@ -15399,7 +16566,8 @@ let }; TestFailWarnings = buildPerlPackage { - name = "Test-FailWarnings-0.008"; + pname = "Test-FailWarnings"; + version = "0.008"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-FailWarnings-0.008.tar.gz; sha256 = "0vx9chcp5x8m0chq574p9fnfckh5gl94j7904rh9v17n568fyd6s"; @@ -15411,10 +16579,11 @@ let }; }; - TestFatal = buildPerlPackage rec { - name = "Test-Fatal-0.014"; + TestFatal = buildPerlPackage { + pname = "Test-Fatal"; + version = "0.014"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.014.tar.gz; sha256 = "bcdcef5c7b2790a187ebca810b0a08221a63256062cfab3c3b98685d91d1cbb0"; }; propagatedBuildInputs = [ TryTiny ]; @@ -15426,7 +16595,8 @@ let }; TestFile = buildPerlPackage { - name = "Test-File-1.443"; + pname = "Test-File"; + version = "1.443"; src = fetchurl { url = mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz; sha256 = "61b4a6ab8f617c8c7b5975164cf619468dc304b6baaaea3527829286fa58bcd5"; @@ -15439,7 +16609,8 @@ let }; TestFileContents = buildPerlModule { - name = "Test-File-Contents-0.23"; + pname = "Test-File-Contents"; + version = "0.23"; src = fetchurl { url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-File-Contents-0.23.tar.gz; sha256 = "cd6fadfb910b34b4b53991ff231dad99929ca8850abec3ad0e2810c4bd7b1f3d"; @@ -15452,7 +16623,8 @@ let }; TestFileShareDir = buildPerlPackage { - name = "Test-File-ShareDir-1.001002"; + pname = "Test-File-ShareDir"; + version = "1.001002"; src = fetchurl { url = mirror://cpan/authors/id/K/KE/KENTNL/Test-File-ShareDir-1.001002.tar.gz; sha256 = "b33647cbb4b2f2fcfbde4f8bb4383d0ac95c2f89c4c5770eb691f1643a337aad"; @@ -15466,8 +16638,9 @@ let }; }; - TestFork = buildPerlModule rec { - name = "Test-Fork-0.02"; + TestFork = buildPerlModule { + pname = "Test-Fork"; + version = "0.02"; src = fetchurl { url = mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Fork-0.02.tar.gz; sha256 = "0gnh8m81fdrwmzy1fix12grfq7sf7nn0gbf24zlap1gq4kxzpzpw"; @@ -15479,7 +16652,8 @@ let }; TestHarnessStraps = buildPerlModule { - name = "Test-Harness-Straps-0.30"; + pname = "Test-Harness-Straps"; + version = "0.30"; src = fetchurl { url = mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Harness-Straps-0.30.tar.gz; sha256 = "8b00efaa35723c1a35c8c8f5fa46a99e4bc528dfa520352b54ac418ef6d1cfa8"; @@ -15490,8 +16664,9 @@ let }; }; - TestHexDifferences = buildPerlPackage rec { - name = "Test-HexDifferences-1.001"; + TestHexDifferences = buildPerlPackage { + pname = "Test-HexDifferences"; + version = "1.001"; src = fetchurl { url = mirror://cpan/authors/id/S/ST/STEFFENW/Test-HexDifferences-1.001.tar.gz; sha256 = "18lh6shpfx567gjikrid4hixydgv1hi3mycl20qzq2j2vpn4afd6"; @@ -15502,8 +16677,9 @@ let }; }; - TestHexString = buildPerlModule rec { - name = "Test-HexString-0.03"; + TestHexString = buildPerlModule { + pname = "Test-HexString"; + version = "0.03"; src = fetchurl { url = mirror://cpan/authors/id/P/PE/PEVANS/Test-HexString-0.03.tar.gz; sha256 = "0h1zl2l1ljlcxsn0xvin9dwiymnhyhnfnxgzg3f9899g37f4qk3x"; @@ -15515,7 +16691,8 @@ let }; TestHTTPServerSimple = buildPerlPackage { - name = "Test-HTTP-Server-Simple-0.11"; + pname = "Test-HTTP-Server-Simple"; + version = "0.11"; src = fetchurl { url = mirror://cpan/authors/id/A/AL/ALEXMV/Test-HTTP-Server-Simple-0.11.tar.gz; sha256 = "85c97ebd4deb805291b17277032da48807228f24f89b1ce2fb3c09f7a896bb78"; @@ -15527,7 +16704,8 @@ let }; TestJSON = buildPerlModule { - name = "Test-JSON-0.11"; + pname = "Test-JSON"; + version = "0.11"; src = fetchurl { url = mirror://cpan/authors/id/O/OV/OVID/Test-JSON-0.11.tar.gz; sha256 = "1cyp46w3q7dg89qkw31ik2h2a6mdx6pzdz2lmp8m0a61zjr8mh07"; @@ -15536,8 +16714,9 @@ let buildInputs = [ TestDifferences ]; }; - TestKwalitee = buildPerlPackage rec { - name = "Test-Kwalitee-1.28"; + TestKwalitee = buildPerlPackage { + pname = "Test-Kwalitee"; + version = "1.28"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Test-Kwalitee-1.28.tar.gz; sha256 = "18s3c8qfr3kmmyxmsn5la2zgbdsgpnkmscnl68i7fnavfpfnqlxl"; @@ -15551,8 +16730,9 @@ let }; }; - TestLeakTrace = buildPerlPackage rec { - name = "Test-LeakTrace-0.16"; + TestLeakTrace = buildPerlPackage { + pname = "Test-LeakTrace"; + version = "0.16"; src = fetchurl { url = mirror://cpan/authors/id/L/LE/LEEJO/Test-LeakTrace-0.16.tar.gz; sha256 = "00z4hcjra5nk700f3fgpy8fs036d7ry7glpn8g3wh7jzj7nrw22z"; @@ -15564,7 +16744,8 @@ let }; TestLectroTest = buildPerlPackage { - name = "Test-LectroTest-0.5001"; + pname = "Test-LectroTest"; + version = "0.5001"; src = fetchurl { url = mirror://cpan/authors/id/T/TM/TMOERTEL/Test-LectroTest-0.5001.tar.gz; sha256 = "0dfpkvn06499gczch4gfmdb05fdj82vlqy7cl6hz36l9jl6lyaxc"; @@ -15576,7 +16757,8 @@ let }; TestLoadAllModules = buildPerlPackage { - name = "Test-LoadAllModules-0.022"; + pname = "Test-LoadAllModules"; + version = "0.022"; src = fetchurl { url = mirror://cpan/authors/id/K/KI/KITANO/Test-LoadAllModules-0.022.tar.gz; sha256 = "1zjwbqk1ns9m8srrhyj3i5zih976i4d2ibflh5s8lr10a1aiz1hv"; @@ -15588,18 +16770,20 @@ let }; }; - TestLongString = buildPerlPackage rec { - name = "Test-LongString-0.17"; + TestLongString = buildPerlPackage { + pname = "Test-LongString"; + version = "0.17"; src = fetchurl { url = mirror://cpan/authors/id/R/RG/RGARCIA/Test-LongString-0.17.tar.gz; sha256 = "0kwp7rfr1i2amz4ckigkv13ah7jr30q6l5k4wk0vxl84myg39i5b"; }; }; - TestMemoryCycle = buildPerlPackage rec { - name = "Test-Memory-Cycle-1.06"; + TestMemoryCycle = buildPerlPackage { + pname = "Test-Memory-Cycle"; + version = "1.06"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-Memory-Cycle-1.06.tar.gz; sha256 = "9d53ddfdc964cd8454cb0da4c695b6a3ae47b45839291c34cb9d8d1cfaab3202"; }; propagatedBuildInputs = [ DevelCycle PadWalker ]; @@ -15609,7 +16793,8 @@ let }; TestMockClass = buildPerlModule { - name = "Test-Mock-Class-0.0303"; + pname = "Test-Mock-Class"; + version = "0.0303"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Test-Mock-Class-0.0303.tar.gz; sha256 = "00pkfqcz7b34q1mvx15k46sbxs22zcrvrbv15rnbn2na57z54bnd"; @@ -15622,10 +16807,11 @@ let }; }; - TestMockGuard = buildPerlModule rec { - name = "Test-Mock-Guard-0.10"; + TestMockGuard = buildPerlModule { + pname = "Test-Mock-Guard"; + version = "0.10"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAICRON/${name}.tar.gz"; + url = mirror://cpan/authors/id/X/XA/XAICRON/Test-Mock-Guard-0.10.tar.gz; sha256 = "7f228a63f8d6ceb92aa784080a13e85073121b2835eca06d794f9709950dbd3d"; }; propagatedBuildInputs = [ ClassLoad ]; @@ -15637,7 +16823,8 @@ let }; TestMockModule = buildPerlModule { - name = "Test-MockModule-0.170.0"; + pname = "Test-MockModule"; + version = "0.170.0"; src = fetchurl { url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.170.0.tar.gz; sha256 = "0pggwrlqj6k44qayhbpjqkzry1r626iy2vf30zlf2jdhbjbvlycz"; @@ -15646,10 +16833,11 @@ let buildInputs = [ TestWarnings ]; }; - SUPER = buildPerlModule rec { - name = "SUPER-1.20141117"; + SUPER = buildPerlModule { + pname = "SUPER"; + version = "1.20141117"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHROMATIC/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CH/CHROMATIC/SUPER-1.20141117.tar.gz; sha256 = "1a620e7d60aee9b13b1b26a44694c43fdb2bba1755cfff435dae83c7d42cc0b2"; }; propagatedBuildInputs = [ SubIdentify ]; @@ -15660,10 +16848,11 @@ let }; - TestMockObject = buildPerlPackage rec { - name = "Test-MockObject-1.20180705"; + TestMockObject = buildPerlPackage { + pname = "Test-MockObject"; + version = "1.20180705"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHROMATIC/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.20180705.tar.gz; sha256 = "4516058d5d511155c1c462dab4027d762d6a474b99f73bf7da20b5ffbd024518"; }; buildInputs = [ CGI TestException TestWarn ]; @@ -15674,16 +16863,18 @@ let }; }; - TestMockTime = buildPerlPackage rec { - name = "Test-MockTime-0.17"; + TestMockTime = buildPerlPackage { + pname = "Test-MockTime"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DD/DDICK/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DD/DDICK/Test-MockTime-0.17.tar.gz; sha256 = "1y820qsq7yf7r6smy5c6f0mpf2cis2q24vwmpim1svv0n8cf2qrk"; }; }; - TestMockTimeHiRes = buildPerlModule rec { - name = "Test-MockTime-HiRes-0.08"; + TestMockTimeHiRes = buildPerlModule { + pname = "Test-MockTime-HiRes"; + version = "0.08"; src = fetchurl { url = mirror://cpan/authors/id/T/TA/TARAO/Test-MockTime-HiRes-0.08.tar.gz; sha256 = "1hfykcjrls6ywgbd49w29c7apj3nq4wlyx7jzpd2glwmz2pgfjaz"; @@ -15697,7 +16888,8 @@ let }; TestMojibake = buildPerlPackage { - name = "Test-Mojibake-1.3"; + pname = "Test-Mojibake"; + version = "1.3"; src = fetchurl { url = mirror://cpan/authors/id/S/SY/SYP/Test-Mojibake-1.3.tar.gz; sha256 = "0cqvbwddgh0pfzmh989gkysi9apqj7dp7jkxfa428db9kgzpbzlg"; @@ -15709,8 +16901,9 @@ let }; }; - TestMoreUTF8 = buildPerlPackage rec { - name = "Test-More-UTF8-0.05"; + TestMoreUTF8 = buildPerlPackage { + pname = "Test-More-UTF8"; + version = "0.05"; src = fetchurl { url = mirror://cpan/authors/id/M/MO/MONS/Test-More-UTF8-0.05.tar.gz; sha256 = "016fs77lmw8xxrcnapvp6wq4hjwgsdfi3l9ylpxgxkcpdarw9wdr"; @@ -15722,7 +16915,8 @@ let }; TestMost = buildPerlPackage { - name = "Test-Most-0.35"; + pname = "Test-Most"; + version = "0.35"; src = fetchurl { url = mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.35.tar.gz; sha256 = "0zv5dyzq55r28plffibcr7wd00abap0h2zh4s4p8snaiszsad5wq"; @@ -15735,10 +16929,11 @@ let buildInputs = [ TestDeep TestDifferences TestException TestWarn ]; }; - TestNeeds = buildPerlPackage rec { - name = "Test-Needs-0.002006"; + TestNeeds = buildPerlPackage { + pname = "Test-Needs"; + version = "0.002006"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; + url = mirror://cpan/authors/id/H/HA/HAARG/Test-Needs-0.002006.tar.gz; sha256 = "77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5"; }; meta = { @@ -15748,7 +16943,8 @@ let }; TestNoTabs = buildPerlPackage { - name = "Test-NoTabs-2.02"; + pname = "Test-NoTabs"; + version = "2.02"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Test-NoTabs-2.02.tar.gz; sha256 = "0c306p9qdpa2ycii3c50hml23mwy6bjxpry126g1dw11hyiwcxgv"; @@ -15760,7 +16956,8 @@ let }; TestNoWarnings = buildPerlPackage { - name = "Test-NoWarnings-1.04"; + pname = "Test-NoWarnings"; + version = "1.04"; src = fetchurl { url = mirror://cpan/authors/id/A/AD/ADAMK/Test-NoWarnings-1.04.tar.gz; sha256 = "0v385ch0hzz9naqwdw2az3zdqi15gka76pmiwlgsy6diiijmg2k3"; @@ -15771,16 +16968,18 @@ let }; }; - TestObject = buildPerlPackage rec { - name = "Test-Object-0.08"; + TestObject = buildPerlPackage { + pname = "Test-Object"; + version = "0.08"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Test-Object-0.08.tar.gz; sha256 = "65278964147837313f4108e55b59676e8a364d6edf01b3dc198aee894ab1d0bb"; }; }; - TestOutput = buildPerlPackage rec { - name = "Test-Output-1.031"; + TestOutput = buildPerlPackage { + pname = "Test-Output"; + version = "1.031"; src = fetchurl { url = mirror://cpan/authors/id/B/BD/BDFOY/Test-Output-1.031.tar.gz; sha256 = "193y1xjvgc1p9pdgdwps2127knvpz9wc1xh6gmr74y3ihmqz7f7q"; @@ -15788,8 +16987,9 @@ let propagatedBuildInputs = [ CaptureTiny ]; }; - TestPAUSEPermissions = buildPerlPackage rec { - name = "Test-PAUSE-Permissions-0.07"; + TestPAUSEPermissions = buildPerlPackage { + pname = "Test-PAUSE-Permissions"; + version = "0.07"; src = fetchurl { url = mirror://cpan/authors/id/S/SK/SKAJI/Test-PAUSE-Permissions-0.07.tar.gz; sha256 = "0gh7f67g1y30yggmwj1pq6xgrx3cfjibj2378nl3gilvyaxw2w2m"; @@ -15802,8 +17002,9 @@ let }; }; - TestPerlCritic = buildPerlModule rec { - name = "Test-Perl-Critic-1.04"; + TestPerlCritic = buildPerlModule { + pname = "Test-Perl-Critic"; + version = "1.04"; src = fetchurl { url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-Perl-Critic-1.04.tar.gz; sha256 = "28f806b5412c7908b56cf1673084b8b44ce1cb54c9417d784d91428e1a04096e"; @@ -15811,8 +17012,9 @@ let propagatedBuildInputs = [ MCE PerlCritic ]; }; - TestPerlTidy = buildPerlModule rec { - name = "Test-PerlTidy-20190402"; + TestPerlTidy = buildPerlModule { + pname = "Test-PerlTidy"; + version = "20190402"; src = fetchurl { url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-20190402.tar.gz; sha256 = "e9cb9b23ed62e8c6a47a1e18b55328aa3bfa467e05cd93e7e12b2738dd1e025f"; @@ -15824,10 +17026,11 @@ let buildInputs = [ TestPerlCritic ]; }; - TestPod = buildPerlPackage rec { - name = "Test-Pod-1.52"; + TestPod = buildPerlPackage { + pname = "Test-Pod"; + version = "1.52"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-Pod-1.52.tar.gz; sha256 = "1z75x1pxwp8ajwq9iazlg2c3wd7rdlim08yclpdg32qnc36dpa30"; }; meta = { @@ -15836,8 +17039,9 @@ let }; }; - TestPodCoverage = buildPerlPackage rec { - name = "Test-Pod-Coverage-1.10"; + TestPodCoverage = buildPerlPackage { + pname = "Test-Pod-Coverage"; + version = "1.10"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEILB/Test-Pod-Coverage-1.10.tar.gz; sha256 = "1m203mhgfilz7iqc8mxaw4lw02fz391mni3n25sfx7nryylwrja8"; @@ -15845,10 +17049,11 @@ let propagatedBuildInputs = [ PodCoverage ]; }; - TestPodLinkCheck = buildPerlModule rec { - name = "Test-Pod-LinkCheck-0.008"; + TestPodLinkCheck = buildPerlModule { + pname = "Test-Pod-LinkCheck"; + version = "0.008"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AP/APOCAL/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AP/APOCAL/Test-Pod-LinkCheck-0.008.tar.gz; sha256 = "2bfe771173c38b69eeb089504e3f76511b8e45e6a9e6dac3e616e400ea67bcf0"; }; buildInputs = [ ModuleBuildTiny TestPod ]; @@ -15859,8 +17064,9 @@ let }; }; - TestPodNo404s = buildPerlModule rec { - name = "Test-Pod-No404s-0.02"; + TestPodNo404s = buildPerlModule { + pname = "Test-Pod-No404s"; + version = "0.02"; src = fetchurl { url = "mirror://cpan/authors/id/A/AP/APOCAL/Test-Pod-No404s-0.02.tar.gz"; sha256 = "0ycfghsyl9f31kxdppjwx2g5iajrqh3fyywz0x7d8ayndw2hdihi"; @@ -15874,7 +17080,8 @@ let }; TestPortabilityFiles = buildPerlPackage { - name = "Test-Portability-Files-0.10"; + pname = "Test-Portability-Files"; + version = "0.10"; src = fetchurl { url = mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.10.tar.gz; sha256 = "08e4b432492dc1b44b55d5db57952eb76379c7f434ee8f16aca64d491f401a16"; @@ -15885,10 +17092,11 @@ let }; }; - TestRequires = buildPerlPackage rec { - name = "Test-Requires-0.10"; + TestRequires = buildPerlPackage { + pname = "Test-Requires"; + version = "0.10"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-Requires-0.10.tar.gz; sha256 = "1d9f481lj12cw1ciil46xq9nq16p6a90nm7yrsalpf8asn8s6s17"; }; meta = { @@ -15897,10 +17105,11 @@ let }; }; - TestRequiresGit = buildPerlPackage rec { - name = "Test-Requires-Git-1.008"; + TestRequiresGit = buildPerlPackage { + pname = "Test-Requires-Git"; + version = "1.008"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOOK/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BO/BOOK/Test-Requires-Git-1.008.tar.gz; sha256 = "70916210970d84d7491451159ab8b67e15251c8c0dae7c3df6c8d88542ea42a6"; }; propagatedBuildInputs = [ GitVersionCompare ]; @@ -15910,8 +17119,9 @@ let }; }; - TestRequiresInternet = buildPerlPackage rec { - name = "Test-RequiresInternet-0.05"; + TestRequiresInternet = buildPerlPackage { + pname = "Test-RequiresInternet"; + version = "0.05"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MALLEN/Test-RequiresInternet-0.05.tar.gz; sha256 = "0gl33vpj9bb78pzyijp884b66sbw6jkh1ci0xki8rmf03hmb79xv"; @@ -15922,10 +17132,11 @@ let }; }; - TestRoo = buildPerlPackage rec { - name = "Test-Roo-1.004"; + TestRoo = buildPerlPackage { + pname = "Test-Roo"; + version = "1.004"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Roo-1.004.tar.gz; sha256 = "1mnym49j1lj7gzylma5b6nr4vp75rmgz2v71904v01xmxhy9l4i1"; }; @@ -15934,7 +17145,8 @@ let }; TestRoutine = buildPerlPackage { - name = "Test-Routine-0.027"; + pname = "Test-Routine"; + version = "0.027"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.027.tar.gz; sha256 = "0n6k310v2py787lkvhzrn8vndws9icdf8mighgl472k0x890xm5s"; @@ -15948,10 +17160,11 @@ let }; }; - TestRun = buildPerlModule rec { - name = "Test-Run-0.0304"; + TestRun = buildPerlModule { + pname = "Test-Run"; + version = "0.0304"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-0.0304.tar.gz; sha256 = "f3feaf9c4494c0b3a5294228cab27efe93653b7e0bbd7fbb99b94b65b247f323"; }; buildInputs = [ TestTrap ]; @@ -15963,10 +17176,11 @@ let }; }; - TestRunCmdLine = buildPerlModule rec { - name = "Test-Run-CmdLine-0.0131"; + TestRunCmdLine = buildPerlModule { + pname = "Test-Run-CmdLine"; + version = "0.0131"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-CmdLine-0.0131.tar.gz; sha256 = "cceeeecd3f4b2f1d2929f3ada351c1ade23a8ac73ef0486dc6e9605ebcdaef18"; }; buildInputs = [ TestRun TestTrap ]; @@ -15979,10 +17193,11 @@ let }; }; - TestRunPluginAlternateInterpreters = buildPerlModule rec { - name = "Test-Run-Plugin-AlternateInterpreters-0.0124"; + TestRunPluginAlternateInterpreters = buildPerlModule { + pname = "Test-Run-Plugin-AlternateInterpreters"; + version = "0.0124"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-AlternateInterpreters-0.0124.tar.gz; sha256 = "eecb3830d350b5d7853322df4f3090af42ff17e9c31075f8d4f69856c968bff3"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap YAMLLibYAML ]; @@ -15994,8 +17209,9 @@ let }; }; - TestRunPluginBreakOnFailure = buildPerlModule rec { - name = "Test-Run-Plugin-BreakOnFailure-0.0.5"; + TestRunPluginBreakOnFailure = buildPerlModule { + pname = "Test-Run-Plugin-BreakOnFailure"; + version = "0.0.5"; src = fetchurl { url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-BreakOnFailure-v0.0.5.tar.gz; sha256 = "e422eb64a2fa6ae59837312e37ab88d68b4945148eb436a3774faed5074f0430"; @@ -16009,10 +17225,11 @@ let }; }; - TestRunPluginColorFileVerdicts = buildPerlModule rec { - name = "Test-Run-Plugin-ColorFileVerdicts-0.0124"; + TestRunPluginColorFileVerdicts = buildPerlModule { + pname = "Test-Run-Plugin-ColorFileVerdicts"; + version = "0.0124"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-ColorFileVerdicts-0.0124.tar.gz; sha256 = "0418f03abe241f5a3c2a2ab3dd2679d11eee42c9e1f5b5a6ea80d9e238374302"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap ]; @@ -16026,10 +17243,11 @@ let }; }; - TestRunPluginColorSummary = buildPerlModule rec { - name = "Test-Run-Plugin-ColorSummary-0.0202"; + TestRunPluginColorSummary = buildPerlModule { + pname = "Test-Run-Plugin-ColorSummary"; + version = "0.0202"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-ColorSummary-0.0202.tar.gz; sha256 = "ea4fb6768c4f6645cedf87d9b7c6baf97364ebc6f4171e4dd5f68939fb2bdd3a"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap ]; @@ -16042,10 +17260,11 @@ let }; }; - TestRunPluginTrimDisplayedFilenames = buildPerlModule rec { - name = "Test-Run-Plugin-TrimDisplayedFilenames-0.0125"; + TestRunPluginTrimDisplayedFilenames = buildPerlModule { + pname = "Test-Run-Plugin-TrimDisplayedFilenames"; + version = "0.0125"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-TrimDisplayedFilenames-0.0125.tar.gz; sha256 = "2255bc5cb6ab65ee4dfff3bcdf007fb74785ff3bb439a9cef5052c66d80424a5"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap YAMLLibYAML ]; @@ -16057,10 +17276,11 @@ let }; }; - TestRunValgrind = buildPerlModule rec { - name = "Test-RunValgrind-0.2.0"; + TestRunValgrind = buildPerlModule { + pname = "Test-RunValgrind"; + version = "0.2.0"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-RunValgrind-0.2.0.tar.gz; sha256 = "70947565ad0be3e5d0cd9aca9e1fd0cb07c873e574310e92e8eca629ec6cd631"; }; buildInputs = [ TestTrap ]; @@ -16071,10 +17291,11 @@ let }; }; - TestScript = buildPerlPackage rec { - name = "Test-Script-1.25"; + TestScript = buildPerlPackage { + pname = "Test-Script"; + version = "1.25"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Test-Script-1.25.tar.gz; sha256 = "199s78hh77zwwqba6pa1ngzjnzrdj2ka6qv5w0i286aafh93705n"; }; @@ -16083,10 +17304,11 @@ let propagatedBuildInputs = [ CaptureTiny ProbePerl ]; }; - TestSharedFork = buildPerlPackage rec { - name = "Test-SharedFork-0.35"; + TestSharedFork = buildPerlPackage { + pname = "Test-SharedFork"; + version = "0.35"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-SharedFork-0.35.tar.gz; sha256 = "17y52j20k1bs9dgf4n6rhh9dn4cfxxbnfn2cfs7pb00fc5jyhci9"; }; buildInputs = [ TestRequires ]; @@ -16097,8 +17319,9 @@ let }; }; - TestSimple13 = buildPerlPackage rec { - name = "Test-Simple-1.302162"; + TestSimple13 = buildPerlPackage { + pname = "Test-Simple"; + version = "1.302162"; src = fetchurl { url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302162.tar.gz; sha256 = "73a0197c3d735e060881da509f4c5fa76c4cbf7dbabd4297d3cf5f5feed31fc4"; @@ -16109,8 +17332,9 @@ let }; }; - TestSpec = buildPerlPackage rec { - name = "Test-Spec-0.54"; + TestSpec = buildPerlPackage { + pname = "Test-Spec"; + version = "0.54"; src = fetchurl { url = mirror://cpan/authors/id/A/AK/AKZHAN/Test-Spec-0.54.tar.gz; sha256 = "1lk5l69bm6yl1zxzz5v6mizzqfinpdhasmi4qjxr1vnwcl9cyc8a"; @@ -16123,8 +17347,9 @@ let buildInputs = [ TestDeep TestTrap ]; }; - TestSubCalls = buildPerlPackage rec { - name = "Test-SubCalls-1.10"; + TestSubCalls = buildPerlPackage { + pname = "Test-SubCalls"; + version = "1.10"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Test-SubCalls-1.10.tar.gz; sha256 = "cbc1e9b35a05e71febc13e5ef547a31c8249899bb6011dbdc9d9ff366ddab6c2"; @@ -16132,10 +17357,11 @@ let propagatedBuildInputs = [ HookLexWrap ]; }; - TestSynopsis = buildPerlPackage rec { - name = "Test-Synopsis-0.15"; + TestSynopsis = buildPerlPackage { + pname = "Test-Synopsis"; + version = "0.15"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZO/ZOFFIX/${name}.tar.gz"; + url = mirror://cpan/authors/id/Z/ZO/ZOFFIX/Test-Synopsis-0.15.tar.gz; sha256 = "1cxxidhwf8j8n41d423ankvls2wdi7aw755csi3hcv3mj9k67mfi"; }; meta = { @@ -16145,7 +17371,8 @@ let }; TestTableDriven = buildPerlPackage { - name = "Test-TableDriven-0.02"; + pname = "Test-TableDriven"; + version = "0.02"; src = fetchurl { url = mirror://cpan/authors/id/J/JR/JROCKWAY/Test-TableDriven-0.02.tar.gz; sha256 = "16l5n6sx3yqdir1rqq21d41znpwzbs8v34gqr93y051arypphn22"; @@ -16156,8 +17383,9 @@ let }; }; - TestTempDirTiny = buildPerlPackage rec { - name = "Test-TempDir-Tiny-0.018"; + TestTempDirTiny = buildPerlPackage { + pname = "Test-TempDir-Tiny"; + version = "0.018"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-TempDir-Tiny-0.018.tar.gz; sha256 = "10ay3zbihyxn4nbb1f0fmr4szag8iy8pd27v8j6idq6cgzys3dyp"; @@ -16170,10 +17398,11 @@ let propagatedBuildInputs = [ FileTemp ]; }; - TestTCP = buildPerlPackage rec { - name = "Test-TCP-2.19"; + TestTCP = buildPerlPackage { + pname = "Test-TCP"; + version = "2.19"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-TCP-2.19.tar.gz; sha256 = "14ahzklq3xgmwj58p9vdcfgpggrmh3nigq5mzqk4wakbb6fjs0fx"; }; meta = { @@ -16183,10 +17412,11 @@ let buildInputs = [ TestSharedFork ]; }; - TestTime = buildPerlPackage rec { - name = "Test-Time-0.05"; + TestTime = buildPerlPackage { + pname = "Test-Time"; + version = "0.05"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SATOH/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SA/SATOH/Test-Time-0.05.tar.gz; sha256 = "abef8885a811440114bfe067edc32f08500fbfd624902f8c3a81fc224ac4b410"; }; meta = { @@ -16195,8 +17425,9 @@ let }; }; - TestToolbox = buildPerlModule rec { - name = "Test-Toolbox-0.4"; + TestToolbox = buildPerlModule { + pname = "Test-Toolbox"; + version = "0.4"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIKO/Test-Toolbox-0.4.tar.gz; sha256 = "1hxx9rhvncvn7wvzhzx4sk00w0xq2scgspfhhyqwjnm1yg3va820"; @@ -16207,10 +17438,11 @@ let }; }; - TestTrailingSpace = buildPerlModule rec { - name = "Test-TrailingSpace-0.0301"; + TestTrailingSpace = buildPerlModule { + pname = "Test-TrailingSpace"; + version = "0.0301"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0301.tar.gz; sha256 = "a28875747adb7a0e7d1ae8a4ffe71869e7ceb3a85d0cb30172959dada7de5970"; }; propagatedBuildInputs = [ FileFindObjectRule ]; @@ -16221,7 +17453,8 @@ let }; TestUnitLite = buildPerlModule { - name = "Test-Unit-Lite-0.1202"; + pname = "Test-Unit-Lite"; + version = "0.1202"; src = fetchurl { url = mirror://cpan/authors/id/D/DE/DEXTER/Test-Unit-Lite-0.1202.tar.gz; sha256 = "1a5jym9hjcpdf0rwyn7gwrzsx4xqzwgzx59rgspqlqiif7p2a79m"; @@ -16233,7 +17466,8 @@ let }; TestWarn = buildPerlPackage { - name = "Test-Warn-0.36"; + pname = "Test-Warn"; + version = "0.36"; src = fetchurl { url = mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.36.tar.gz; sha256 = "1nkc7jzxff0w4x9axbpsgxrksqdjnf70rb74q39zikkrsd3a7g7c"; @@ -16245,10 +17479,11 @@ let }; }; - TestWarnings = buildPerlPackage rec { - name = "Test-Warnings-0.026"; + TestWarnings = buildPerlPackage { + pname = "Test-Warnings"; + version = "0.026"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.026.tar.gz; sha256 = "ae2b68b1b5616704598ce07f5118efe42dc4605834453b7b2be14e26f9cc9a08"; }; buildInputs = [ CPANMetaCheck ]; @@ -16260,7 +17495,8 @@ let }; TestWithoutModule = buildPerlPackage { - name = "Test-Without-Module-0.20"; + pname = "Test-Without-Module"; + version = "0.20"; src = fetchurl { url = mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.20.tar.gz; sha256 = "8e9aeb7c32a6c6d0b8a93114db2a8c072721273a9d9a2dd4f9ca86cfd28aa524"; @@ -16272,7 +17508,8 @@ let }; TestWWWMechanize = buildPerlPackage { - name = "Test-WWW-Mechanize-1.52"; + pname = "Test-WWW-Mechanize"; + version = "1.52"; src = fetchurl { url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.52.tar.gz; sha256 = "1jsywlbxhqw39ij7s8vmgff5vys58vlfaq27072awacnxc65aal4"; @@ -16286,8 +17523,9 @@ let }; }; - TestWWWMechanizeCatalyst = buildPerlPackage rec { - name = "Test-WWW-Mechanize-Catalyst-0.62"; + TestWWWMechanizeCatalyst = buildPerlPackage { + pname = "Test-WWW-Mechanize-Catalyst"; + version = "0.62"; src = fetchurl { url = mirror://cpan/authors/id/M/MS/MSTROUT/Test-WWW-Mechanize-Catalyst-0.62.tar.gz; sha256 = "1cdc2q16vs6fb335pzaislz2rx1ph9acaxyp7v5hv9xbwwddwfqq"; @@ -16302,7 +17540,8 @@ let }; TestWWWMechanizeCGI = buildPerlPackage { - name = "Test-WWW-Mechanize-CGI-0.1"; + pname = "Test-WWW-Mechanize-CGI"; + version = "0.1"; src = fetchurl { url = mirror://cpan/authors/id/M/MR/MRAMBERG/Test-WWW-Mechanize-CGI-0.1.tar.gz; sha256 = "0bwwdk0iai5dlvvfpja971qpgvmf6yq67iag4z4szl9v5sra0xm5"; @@ -16312,7 +17551,8 @@ let }; TestWWWMechanizePSGI = buildPerlPackage { - name = "Test-WWW-Mechanize-PSGI-0.39"; + pname = "Test-WWW-Mechanize-PSGI"; + version = "0.39"; src = fetchurl { url = mirror://cpan/authors/id/O/OA/OALDERS/Test-WWW-Mechanize-PSGI-0.39.tar.gz; sha256 = "0n4rhyyags3cwqb0gb1pr6gccd2x3l190j8gd96lwlvxnjrklss7"; @@ -16326,7 +17566,8 @@ let }; TestXPath = buildPerlModule { - name = "Test-XPath-0.19"; + pname = "Test-XPath"; + version = "0.19"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MANWAR/Test-XPath-0.19.tar.gz; sha256 = "1wy0488yg15kahfafnlmlhppxik7d0z00wxwj9fszrsq2h6crz6y"; @@ -16334,8 +17575,9 @@ let propagatedBuildInputs = [ XMLLibXML ]; }; - TestYAML = buildPerlPackage rec { - name = "Test-YAML-1.07"; + TestYAML = buildPerlPackage { + pname = "Test-YAML"; + version = "1.07"; src = fetchurl { url = mirror://cpan/authors/id/T/TI/TINITA/Test-YAML-1.07.tar.gz; sha256 = "0pwrrnwi1qaiy3c5522vy0kzncxc9g02r4b056wqqaa69w1hsc0z"; @@ -16343,10 +17585,11 @@ let buildInputs = [ TestBase ]; }; - TextAligner = buildPerlModule rec { - name = "Text-Aligner-0.13"; + TextAligner = buildPerlModule { + pname = "Text-Aligner"; + version = "0.13"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Aligner-0.13.tar.gz; sha256 = "1vry21jrh91l2pkajnrps83bnr1fn6zshbzi80mcrnggrn9iq776"; }; meta = { @@ -16354,10 +17597,11 @@ let }; }; - TextAspell = buildPerlPackage rec { - name = "Text-Aspell-0.09"; + TextAspell = buildPerlPackage { + pname = "Text-Aspell"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HANK/${name}.tar.gz"; + url = mirror://cpan/authors/id/H/HA/HANK/Text-Aspell-0.09.tar.gz; sha256 = "0r9g31rd55934mp6n45b96g934ck4qns8x9i7qckn9wfy44k5sib"; }; propagatedBuildInputs = [ pkgs.aspell ]; @@ -16367,7 +17611,8 @@ let }; TextAutoformat = buildPerlPackage { - name = "Text-Autoformat-1.74"; + pname = "Text-Autoformat"; + version = "1.74"; src = fetchurl { url = mirror://cpan/authors/id/N/NE/NEILB/Text-Autoformat-1.74.tar.gz; sha256 = "07eb3c2b3515897340ca6e9377495bbe2e05ec80d7f3f146adab8e534a818d5e"; @@ -16381,7 +17626,8 @@ let }; TextBalanced = buildPerlPackage { - name = "Text-Balanced-2.03"; + pname = "Text-Balanced"; + version = "2.03"; src = fetchurl { url = mirror://cpan/authors/id/S/SH/SHAY/Text-Balanced-2.03.tar.gz; sha256 = "057753f8f0568b53921f66a60a89c30092b73329bcc61a2c43339ab70c9792c8"; @@ -16392,11 +17638,12 @@ let }; }; - TextBibTeX = buildPerlModule rec { - name = "Text-BibTeX-0.87"; + TextBibTeX = buildPerlModule { + pname = "Text-BibTeX"; + version = "0.87"; buildInputs = [ CaptureTiny ConfigAutoConf ExtUtilsLibBuilder ]; src = fetchurl { - url = "mirror://cpan/authors/id/A/AM/AMBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.87.tar.gz; sha256 = "1qhm0fin3j6nqpzlk0xy1lx6bzcrhb7fr82rjgkcq0wgmw91mqax"; }; perlPreHook = "export LD=$CC"; @@ -16416,24 +17663,27 @@ let }; }; - TextBrew = buildPerlPackage rec { - name = "Text-Brew-0.02"; + TextBrew = buildPerlPackage { + pname = "Text-Brew"; + version = "0.02"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KC/KCIVEY/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KC/KCIVEY/Text-Brew-0.02.tar.gz; sha256 = "0k7nxglbx5pxl693zrj1fsi094sf1a3vqsrn73inzz7r3j28a6xa"; }; }; - TextCharWidth = buildPerlPackage rec { - name = "Text-CharWidth-0.04"; + TextCharWidth = buildPerlPackage { + pname = "Text-CharWidth"; + version = "0.04"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KU/KUBOTA/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KU/KUBOTA/Text-CharWidth-0.04.tar.gz; sha256 = "abded5f4fdd9338e89fd2f1d8271c44989dae5bf50aece41b6179d8e230704f8"; }; }; - TextCSV = buildPerlPackage rec { - name = "Text-CSV-1.99"; + TextCSV = buildPerlPackage { + pname = "Text-CSV"; + version = "1.99"; src = fetchurl { url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.99.tar.gz; sha256 = "e74ec039b12cc51d346bf1d814af7db8a05cb0a98340e7547a21646da8668cd2"; @@ -16444,10 +17694,11 @@ let }; }; - TextCSVEncoded = buildPerlPackage rec { - name = "Text-CSV-Encoded-0.25"; + TextCSVEncoded = buildPerlPackage { + pname = "Text-CSV-Encoded"; + version = "0.25"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZA/ZARQUON/${name}.tar.gz"; + url = mirror://cpan/authors/id/Z/ZA/ZARQUON/Text-CSV-Encoded-0.25.tar.gz; sha256 = "1l5rwlmnpnhjszb200a94lwvkwslsvyxm24ycf37gm8dla1mk2i4"; }; propagatedBuildInputs = [ TextCSV ]; @@ -16457,10 +17708,11 @@ let }; }; - TextCSV_XS = buildPerlPackage rec { - name = "Text-CSV_XS-1.39"; + TextCSV_XS = buildPerlPackage { + pname = "Text-CSV_XS"; + version = "1.39"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HM/HMBRAND/${name}.tgz"; + url = mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.39.tgz; sha256 = "aa4e424eaf68bea0d0e8c16b961c942b64926e6183ce1dbbc6c799eafb0a9ebd"; }; meta = { @@ -16469,10 +17721,11 @@ let }; }; - TextDiff = buildPerlPackage rec { - name = "Text-Diff-1.45"; + TextDiff = buildPerlPackage { + pname = "Text-Diff"; + version = "1.45"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NE/NEILB/Text-Diff-1.45.tar.gz; sha256 = "013g13prdghxvrp5754gyc7rmv1syyxrhs33yc5f0lrz3dxs1fp8"; }; propagatedBuildInputs = [ AlgorithmDiff ]; @@ -16482,10 +17735,11 @@ let }; }; - TextFormat = buildPerlModule rec { - name = "Text-Format-0.61"; + TextFormat = buildPerlModule { + pname = "Text-Format"; + version = "0.61"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.61.tar.gz; sha256 = "bb8a3b8ff515c85101baf553a769337f944a05cde81f111ae78aff416bf4ae2b"; }; meta = { @@ -16496,8 +17750,9 @@ let }; }; - TextGerman = buildPerlPackage rec { - name = "Text-German-0.06"; + TextGerman = buildPerlPackage { + pname = "Text-German"; + version = "0.06"; src = fetchurl { url = mirror://cpan/authors/id/U/UL/ULPFR/Text-German-0.06.tar.gz; sha256 = "1p87pgap99lw0nv62i3ghvsi7yg90lhn8vsa3yqp75rd04clybcj"; @@ -16506,8 +17761,9 @@ let }; }; - TextGlob = buildPerlPackage rec { - name = "Text-Glob-0.11"; + TextGlob = buildPerlPackage { + pname = "Text-Glob"; + version = "0.11"; src = fetchurl { url = mirror://cpan/authors/id/R/RC/RCLAMP/Text-Glob-0.11.tar.gz; sha256 = "11sj62fynfgwrlgkv5a051cq6yn0pagxqjsz27dxx8phsd4wv706"; @@ -16515,7 +17771,8 @@ let }; TextIconv = buildPerlPackage { - name = "Text-Iconv-1.7"; + pname = "Text-Iconv"; + version = "1.7"; src = fetchurl { url = mirror://cpan/authors/id/M/MP/MPIOTR/Text-Iconv-1.7.tar.gz; sha256 = "5b80b7d5e709d34393bcba88971864a17b44a5bf0f9e4bcee383d029e7d2d5c3"; @@ -16523,7 +17780,8 @@ let }; TestInter = buildPerlPackage { - name = "Test-Inter-1.09"; + pname = "Test-Inter"; + version = "1.09"; src = fetchurl { url = mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.09.tar.gz; sha256 = "1e9f129cc1a001fb95449d385253b38afabf5b466e3b3bd33e4e430f216e177a"; @@ -16536,7 +17794,8 @@ let }; TestManifest = buildPerlPackage { - name = "Test-Manifest-2.021"; + pname = "Test-Manifest"; + version = "2.021"; src = fetchurl { url = mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.021.tar.gz; sha256 = "a47aaad71c580e16e6e63d8c037cdddcd919876754beb2c95d9a88682dd332d9"; @@ -16547,19 +17806,21 @@ let }; }; - TextMarkdown = buildPerlPackage rec { - name = "Text-Markdown-1.000031"; + TextMarkdown = buildPerlPackage { + pname = "Text-Markdown"; + version = "1.000031"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Text-Markdown-1.000031.tar.gz; sha256 = "06y79lla8adkqhrs41xdddqjs81dcrh266b50mfbg37bxkawd4f1"; }; buildInputs = [ ListMoreUtils TestDifferences TestException ]; }; - TestMinimumVersion = buildPerlPackage rec { - name = "Test-MinimumVersion-0.101082"; + TestMinimumVersion = buildPerlPackage { + pname = "Test-MinimumVersion"; + version = "0.101082"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Test-MinimumVersion-0.101082.tar.gz; sha256 = "3fba4e8fcf74806259aa639be7d90e70346ad0e0e4b8b619593490e378241970"; }; propagatedBuildInputs = [ PerlMinimumVersion ]; @@ -16571,7 +17832,8 @@ let }; TextMicroTemplate = buildPerlPackage { - name = "Text-MicroTemplate-0.24"; + pname = "Text-MicroTemplate"; + version = "0.24"; src = fetchurl { url = mirror://cpan/authors/id/K/KA/KAZUHO/Text-MicroTemplate-0.24.tar.gz; sha256 = "1j5ljx7hs4k29732nr5f2m4kssz4rqjw3kknsnhams2yydqix01j"; @@ -16583,7 +17845,8 @@ let }; TestNumberDelta = buildPerlPackage { - name = "Test-Number-Delta-1.06"; + pname = "Test-Number-Delta"; + version = "1.06"; src = fetchurl { url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Number-Delta-1.06.tar.gz; sha256 = "535430919e6fdf6ce55ff76e9892afccba3b7d4160db45f3ac43b0f92ffcd049"; @@ -16596,7 +17859,8 @@ let }; TextPasswordPronounceable = buildPerlPackage { - name = "Text-Password-Pronounceable-0.30"; + pname = "Text-Password-Pronounceable"; + version = "0.30"; src = fetchurl { url = mirror://cpan/authors/id/T/TS/TSIBLEY/Text-Password-Pronounceable-0.30.tar.gz; sha256 = "c186a50256e0bedfafb17e7ce157e7c52f19503bb79e18ebf06255911f6ead1a"; @@ -16606,8 +17870,9 @@ let }; }; - TextPDF = buildPerlPackage rec { - name = "Text-PDF-0.31"; + TextPDF = buildPerlPackage { + pname = "Text-PDF"; + version = "0.31"; src = fetchurl { url = mirror://cpan/authors/id/B/BH/BHALLISSY/Text-PDF-0.31.tar.gz; sha256 = "0s5cimfr4wwzgv15k30x83ncg1257jwsvmbmb86lp02rw5g537yz"; @@ -16615,7 +17880,8 @@ let }; TextQuoted = buildPerlPackage { - name = "Text-Quoted-2.10"; + pname = "Text-Quoted"; + version = "2.10"; src = fetchurl { url = mirror://cpan/authors/id/B/BP/BPS/Text-Quoted-2.10.tar.gz; sha256 = "081bf95ec9220af26cec89161e61bf73f9fbcbfeee1d9af15139e5d7b708f445"; @@ -16627,10 +17893,11 @@ let }; }; - TextRecordParser = buildPerlPackage rec { - name = "Text-RecordParser-1.6.5"; + TextRecordParser = buildPerlPackage { + pname = "Text-RecordParser"; + version = "1.6.5"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KC/KCLARK/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KC/KCLARK/Text-RecordParser-1.6.5.tar.gz; sha256 = "0nn33c058bl957v38xhqig4ld34lifl4arqiilhxky339i0q2fys"; }; @@ -16643,7 +17910,8 @@ let }; TextReform = buildPerlModule { - name = "Text-Reform-1.20"; + pname = "Text-Reform"; + version = "1.20"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHORNY/Text-Reform-1.20.tar.gz; sha256 = "a8792dd8c1aac97001032337b36a356be96e2d74c4f039ef9a363b641db4ae61"; @@ -16654,8 +17922,9 @@ let }; }; - TextRoman = buildPerlPackage rec { - name = "Text-Roman-3.5"; + TextRoman = buildPerlPackage { + pname = "Text-Roman"; + version = "3.5"; src = fetchurl { url = mirror://cpan/authors/id/S/SY/SYP/Text-Roman-3.5.tar.gz; sha256 = "0sh47svzz0wm993ywfgpn0fvhajl2sj5hcnf5zxjz02in6ihhjnb"; @@ -16667,7 +17936,8 @@ let }; TextSimpleTable = buildPerlPackage { - name = "Text-SimpleTable-2.07"; + pname = "Text-SimpleTable"; + version = "2.07"; src = fetchurl { url = mirror://cpan/authors/id/M/MR/MRAMBERG/Text-SimpleTable-2.07.tar.gz; sha256 = "1v8r8qpzg283p2pqqr8dqrak2bxray1b2jmib0qk75jffqw3yv95"; @@ -16680,17 +17950,19 @@ let }; TextSoundex = buildPerlPackage { - name = "Text-Soundex-3.05"; + pname = "Text-Soundex"; + version = "3.05"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Text-Soundex-3.05.tar.gz; sha256 = "f6dd55b4280b25dea978221839864382560074e1d6933395faee2510c2db60ed"; }; }; - TextSprintfNamed = buildPerlModule rec { - name = "Text-Sprintf-Named-0.0403"; + TextSprintfNamed = buildPerlModule { + pname = "Text-Sprintf-Named"; + version = "0.0403"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Sprintf-Named-0.0403.tar.gz; sha256 = "8a2f6e52998d1d8adb6ce0f5be85265be2e51ce06cf8ae23b3a0f059ba21b888"; }; buildInputs = [ TestWarn ]; @@ -16700,10 +17972,11 @@ let }; }; - TextTable = buildPerlModule rec { - name = "Text-Table-1.133"; + TextTable = buildPerlModule { + pname = "Text-Table"; + version = "1.133"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.133.tar.gz; sha256 = "04kh5x5inq183rdg221wlqaaqi1ipyj588mxsslik6nhc14f17nd"; }; propagatedBuildInputs = [ TextAligner ]; @@ -16714,16 +17987,18 @@ let }; }; - TextTabularDisplay = buildPerlPackage rec { - name = "Text-TabularDisplay-1.38"; + TextTabularDisplay = buildPerlPackage { + pname = "Text-TabularDisplay"; + version = "1.38"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DARREN/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DA/DARREN/Text-TabularDisplay-1.38.tar.gz; sha256 = "1s46s4pg5mpfllx3icf4vnqz9iadbbdbsr5p7pr6gdjnzbx902gb"; }; }; TextTemplate = buildPerlPackage { - name = "Text-Template-1.55"; + pname = "Text-Template"; + version = "1.55"; src = fetchurl { url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.55.tar.gz; sha256 = "a4948be945250c17f9f0aaee56cc79b3195dcebcb75215b55d6ed1ca2b02f18b"; @@ -16731,8 +18006,9 @@ let buildInputs = [ TestMoreUTF8 TestWarnings ]; }; - TestTrap = buildPerlModule rec { - name = "Test-Trap-0.3.4"; + TestTrap = buildPerlModule { + pname = "Test-Trap"; + version = "0.3.4"; src = fetchurl { url = mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.4.tar.gz; sha256 = "1qjs2080kcc66s4d7499br5lw2qmhr9gxky4xsl6vjdn6dpna10b"; @@ -16744,10 +18020,11 @@ let }; }; - TestVars = buildPerlModule rec { - name = "Test-Vars-0.014"; + TestVars = buildPerlModule { + pname = "Test-Vars"; + version = "0.014"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Test-Vars-0.014.tar.gz; sha256 = "0qr8q0ksr925ycwbsyxjwgz4p9r7a8vkxpn33vy23zbijwpa3xx7"; }; @@ -16760,10 +18037,11 @@ let }; }; - TestVersion = buildPerlPackage rec { - name = "Test-Version-2.09"; + TestVersion = buildPerlPackage { + pname = "Test-Version"; + version = "2.09"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Test-Version-2.09.tar.gz; sha256 = "9ce1dd2897a5f30e1b7f8966ec66f57d8d8f280f605f28c7ca221fa79aca38e0"; }; buildInputs = [ TestException ]; @@ -16775,7 +18053,8 @@ let }; TextTrim = buildPerlModule { - name = "Text-Trim-1.02"; + pname = "Text-Trim"; + version = "1.02"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MATTLAW/Text-Trim-1.02.tar.gz; sha256 = "1bnwjl5n04w8nnrzrm75ljn4pijqbijr9csfkjcs79h4gwn9lwqw"; @@ -16787,7 +18066,8 @@ let }; TextUnaccent = buildPerlPackage { - name = "Text-Unaccent-1.08"; + pname = "Text-Unaccent"; + version = "1.08"; src = fetchurl { url = mirror://cpan/authors/id/L/LD/LDACHARY/Text-Unaccent-1.08.tar.gz; sha256 = "0avk50kia78kxryh2whmaj5l18q2wvmkdyqyjsf6kwr4kgy6x3i7"; @@ -16796,8 +18076,9 @@ let NIX_CFLAGS_COMPILE = [ "-DHAS_VPRINTF" ]; }; - TextUnidecode = buildPerlPackage rec { - name = "Text-Unidecode-1.30"; + TextUnidecode = buildPerlPackage { + pname = "Text-Unidecode"; + version = "1.30"; src = fetchurl { url = mirror://cpan/authors/id/S/SB/SBURKE/Text-Unidecode-1.30.tar.gz; sha256 = "1imii0p6wvhrxsr5z2zhazpx5vl4l4ybf1y2c5hy480xvi6z293c"; @@ -16805,7 +18086,8 @@ let }; Testutf8 = buildPerlPackage { - name = "Test-utf8-1.01"; + pname = "Test-utf8"; + version = "1.01"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.01.tar.gz; sha256 = "ef371b1769cd8d36d2d657e8321723d94c8f8d89e7fd7437c6648c5dc6711b7a"; @@ -16817,10 +18099,11 @@ let }; }; - TextNSP = buildPerlPackage rec { - name = "Text-NSP-1.31"; + TextNSP = buildPerlPackage { + pname = "Text-NSP"; + version = "1.31"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TP/TPEDERSE/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TP/TPEDERSE/Text-NSP-1.31.tar.gz; sha256 = "a01201beb29636b3e41ecda2a6cf6522fd265416bd6d994fad02f59fb49cf595"; }; meta = { @@ -16830,10 +18113,11 @@ let }; }; - TextvFileasData = buildPerlPackage rec { - name = "Text-vFile-asData-0.08"; + TextvFileasData = buildPerlPackage { + pname = "Text-vFile-asData"; + version = "0.08"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RC/RCLAMP/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RC/RCLAMP/Text-vFile-asData-0.08.tar.gz; sha256 = "b291ab5e0f987c5172560a692234711a75e4596d83475f72d01278369532f82a"; }; propagatedBuildInputs = [ ClassAccessorChained ]; @@ -16844,7 +18128,8 @@ let }; TextWikiFormat = buildPerlModule { - name = "Text-WikiFormat-0.81"; + pname = "Text-WikiFormat"; + version = "0.81"; src = fetchurl { url = mirror://cpan/authors/id/C/CY/CYCLES/Text-WikiFormat-0.81.tar.gz; sha256 = "0cxbgx879bsskmnhjzamgsa5862ddixyx4yr77lafmwimnaxjg74"; @@ -16853,7 +18138,8 @@ let }; TextWrapI18N = buildPerlPackage { - name = "Text-WrapI18N-0.06"; + pname = "Text-WrapI18N"; + version = "0.06"; src = fetchurl { url = mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz; sha256 = "4bd29a17f0c2c792d12c1005b3c276f2ab0fae39c00859ae1741d7941846a488"; @@ -16871,7 +18157,8 @@ let }; TextWrapper = buildPerlPackage { - name = "Text-Wrapper-1.05"; + pname = "Text-Wrapper"; + version = "1.05"; src = fetchurl { url = mirror://cpan/authors/id/C/CJ/CJM/Text-Wrapper-1.05.tar.gz; sha256 = "64268e15983a9df47e1d9199a491f394e89f542e54afb33f4b78f3f318e09ab9"; @@ -16883,10 +18170,11 @@ let buildInputs = [ TestDifferences ]; }; - threadsshared = buildPerlPackage rec { - name = "threads-shared-1.59"; + threadsshared = buildPerlPackage { + pname = "threads-shared"; + version = "1.59"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JD/JDHEDDEN/threads-shared-1.59.tar.gz; sha256 = "1krz69ks3siz0fhc9waf817nnlmxsgq7rc5rq99xvqg1f1g9iz6i"; }; meta = { @@ -16895,10 +18183,11 @@ let }; }; - ThreadQueue = buildPerlPackage rec { - name = "Thread-Queue-3.13"; + ThreadQueue = buildPerlPackage { + pname = "Thread-Queue"; + version = "3.13"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Queue-3.13.tar.gz; sha256 = "1s6wpxy07mr03krkzjr5r02cswsj18dd38aa5f16dfrgvp6xm8vb"; }; meta = { @@ -16907,10 +18196,11 @@ let }; }; - Throwable = buildPerlPackage rec { - name = "Throwable-0.200013"; + Throwable = buildPerlPackage { + pname = "Throwable"; + version = "0.200013"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Throwable-0.200013.tar.gz; sha256 = "184gdcwxqwnkrx5md968v1ny70pq6blzpkihccm3bpdxnpgd11wr"; }; propagatedBuildInputs = [ DevelStackTrace Moo ]; @@ -16921,10 +18211,11 @@ let }; }; - TieCacheLRU = buildPerlPackage rec { - name = "Tie-Cache-LRU-20150301"; + TieCacheLRU = buildPerlPackage { + pname = "Tie-Cache-LRU"; + version = "20150301"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHWERN/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MS/MSCHWERN/Tie-Cache-LRU-20150301.tar.gz; sha256 = "1bf740450d3a6d7c12b48c25f7da5964e44e7cc38b28572cfb76ff22464f4469"; }; propagatedBuildInputs = [ ClassVirtual enum ]; @@ -16934,10 +18225,11 @@ let }; }; - TieCacheLRUExpires = buildPerlPackage rec { - name = "Tie-Cache-LRU-Expires-0.55"; + TieCacheLRUExpires = buildPerlPackage { + pname = "Tie-Cache-LRU-Expires"; + version = "0.55"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OE/OESTERHOL/${name}.tar.gz"; + url = mirror://cpan/authors/id/O/OE/OESTERHOL/Tie-Cache-LRU-Expires-0.55.tar.gz; sha256 = "b316d849acd25f24346d55a9950d281fee0746398767c601234122159573eb9a"; }; propagatedBuildInputs = [ TieCacheLRU ]; @@ -16946,10 +18238,11 @@ let }; }; - TieCycle = buildPerlPackage rec { - name = "Tie-Cycle-1.225"; + TieCycle = buildPerlPackage { + pname = "Tie-Cycle"; + version = "1.225"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; + url = mirror://cpan/authors/id/B/BD/BDFOY/Tie-Cycle-1.225.tar.gz; sha256 = "0i9xq2qm50p2ih24265jndp2x8hfq7ap0d88nrlv5yaad4hxhc7k"; }; meta = { @@ -16959,7 +18252,8 @@ let }; TieFile = buildPerlPackage { - name = "Tie-File-1.00"; + pname = "Tie-File"; + version = "1.00"; src = fetchurl { url = mirror://cpan/authors/id/T/TO/TODDR/Tie-File-1.00.tar.gz; sha256 = "7ca9c8a957cf743d3a98d0eb5deb767b1e14b4f00bc9d03da83d466fcb76bd44"; @@ -16970,7 +18264,8 @@ let }; TieIxHash = buildPerlModule { - name = "Tie-IxHash-1.23"; + pname = "Tie-IxHash"; + version = "1.23"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHORNY/Tie-IxHash-1.23.tar.gz; sha256 = "0mmg9iyh42syal3z1p2pn9airq65yrkfs66cnqs9nz76jy60pfzs"; @@ -16981,10 +18276,11 @@ let }; }; - TieHandleOffset = buildPerlPackage rec { - name = "Tie-Handle-Offset-0.004"; + TieHandleOffset = buildPerlPackage { + pname = "Tie-Handle-Offset"; + version = "0.004"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Tie-Handle-Offset-0.004.tar.gz; sha256 = "ee9f39055dc695aa244a252f56ffd37f8be07209b337ad387824721206d2a89e"; }; meta = { @@ -16995,7 +18291,8 @@ let }; TieHashIndexed = buildPerlPackage { - name = "Tie-Hash-Indexed-0.05"; + pname = "Tie-Hash-Indexed"; + version = "0.05"; src = fetchurl { url = mirror://cpan/authors/id/M/MH/MHX/Tie-Hash-Indexed-0.05.tar.gz; sha256 = "a8862a4763d58a8c785e34b8b18e5db4ce5c3e36b9b5cf565a3088584eab361e"; @@ -17008,17 +18305,19 @@ let }; TieRefHash = buildPerlPackage { - name = "Tie-RefHash-1.39"; + pname = "Tie-RefHash"; + version = "1.39"; src = fetchurl { url = mirror://cpan/authors/id/F/FL/FLORA/Tie-RefHash-1.39.tar.gz; sha256 = "b0b80ef571e7dadb726b8214f7352a932a8fa82af29072895aa1aadc89f48bec"; }; }; - TieRegexpHash = buildPerlPackage rec { - name = "Tie-RegexpHash-0.17"; + TieRegexpHash = buildPerlPackage { + pname = "Tie-RegexpHash"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AL/ALTREUS/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AL/ALTREUS/Tie-RegexpHash-0.17.tar.gz; sha256 = "0c207850e77efb16618e0aa015507926a3425b34aad5aa6e3e40d83989a085a3"; }; meta = { @@ -17026,8 +18325,9 @@ let }; }; - TieSub = buildPerlPackage rec { - name = "Tie-Sub-1.001"; + TieSub = buildPerlPackage { + pname = "Tie-Sub"; + version = "1.001"; src = fetchurl { url = mirror://cpan/authors/id/S/ST/STEFFENW/Tie-Sub-1.001.tar.gz; sha256 = "1cgiyj85hhw2m4x2iv4zgaj3hzf3fghircpcfqmjndni4r4a0wgg"; @@ -17041,7 +18341,8 @@ let }; TieToObject = buildPerlPackage { - name = "Tie-ToObject-0.03"; + pname = "Tie-ToObject"; + version = "0.03"; src = fetchurl { url = mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz; sha256 = "1x1smn1kw383xc5h9wajxk9dlx92bgrbf7gk4abga57y6120s6m3"; @@ -17049,17 +18350,19 @@ let }; TimeDate = buildPerlPackage { - name = "TimeDate-2.30"; + pname = "TimeDate"; + version = "2.30"; src = fetchurl { url = mirror://cpan/authors/id/G/GB/GBARR/TimeDate-2.30.tar.gz; sha256 = "11lf54akr9nbivqkjrhvkmfdgkbhw85sq0q4mak56n6bf542bgbm"; }; }; - TimeDuration = buildPerlPackage rec { - name = "Time-Duration-1.20"; + TimeDuration = buildPerlPackage { + pname = "Time-Duration"; + version = "1.20"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-1.20.tar.gz; sha256 = "1f5vkid4pl5iq3hal01hk1zjbbzrqpx4m1djawbp93l152shb0j5"; }; meta = { @@ -17068,10 +18371,11 @@ let }; }; - TimeDurationParse = buildPerlPackage rec { - name = "Time-Duration-Parse-0.14"; + TimeDurationParse = buildPerlPackage { + pname = "Time-Duration-Parse"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-Parse-0.14.tar.gz; sha256 = "17nh73r50mqqpgxdf3zpgdiqrizmjy0vdk0zd6xi9zcsdijrdhnc"; }; buildInputs = [ TimeDuration ]; @@ -17083,7 +18387,8 @@ let }; TimeLocal = buildPerlPackage { - name = "Time-Local-1.28"; + pname = "Time-Local"; + version = "1.28"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.28.tar.gz; sha256 = "9278b9e5cc99dcbb0fd27a43e914828b59685601edae082889b5ee7266afe10e"; @@ -17095,7 +18400,8 @@ let }; TimeParseDate = buildPerlPackage { - name = "Time-ParseDate-2015.103"; + pname = "Time-ParseDate"; + version = "2015.103"; src = fetchurl { url = mirror://cpan/authors/id/M/MU/MUIR/modules/Time-ParseDate-2015.103.tar.gz; sha256 = "2c1a06235bf811813caac9eaa9daa71af758667cdf7b082cb59863220fcaeed1"; @@ -17107,7 +18413,8 @@ let }; TimePeriod = buildPerlPackage { - name = "Time-Period-1.25"; + pname = "Time-Period"; + version = "1.25"; src = fetchurl { url = "mirror://cpan/authors/id/P/PB/PBOYD/Time-Period-1.25.tar.gz"; sha256 = "d07fa580529beac6a9c8274c6bf220b4c3aade685df65c1669d53339bf6ef1e8"; @@ -17119,10 +18426,11 @@ let }; }; - Tk = buildPerlPackage rec { - name = "Tk-804.034"; + Tk = buildPerlPackage { + pname = "Tk"; + version = "804.034"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SREZIC/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.034.tar.gz; sha256 = "fea6b144c723528a2206c8cd9175844032ee9c14ee37791f0f151e5e5b293fe2"; }; makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib"; @@ -17133,10 +18441,11 @@ let }; }; - TreeDAGNode = buildPerlPackage rec { - name = "Tree-DAG_Node-1.31"; + TreeDAGNode = buildPerlPackage { + pname = "Tree-DAG_Node"; + version = "1.31"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSAVAGE/${name}.tgz"; + url = mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-DAG_Node-1.31.tgz; sha256 = "016kr76azxzfcpxjkhqp2piyyl6529shjis20mc3g2snfabsd2qw"; }; meta = { @@ -17146,10 +18455,11 @@ let propagatedBuildInputs = [ FileSlurpTiny ]; }; - TreeSimple = buildPerlPackage rec { - name = "Tree-Simple-1.33"; + TreeSimple = buildPerlPackage { + pname = "Tree-Simple"; + version = "1.33"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSAVAGE/${name}.tgz"; + url = mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-1.33.tgz; sha256 = "1alnwb6c7n4al91m9cyknvcyvdz521lh22dz1hyk4v7c50adffnv"; }; buildInputs = [ TestException ]; @@ -17160,7 +18470,8 @@ let }; TreeSimpleVisitorFactory = buildPerlPackage { - name = "Tree-Simple-VisitorFactory-0.15"; + pname = "Tree-Simple-VisitorFactory"; + version = "0.15"; src = fetchurl { url = mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-VisitorFactory-0.15.tgz; sha256 = "06y2vazkl307k59hnkp9h5bp3p7711kgmp1qdhb2lgnfwzn84zin"; @@ -17170,7 +18481,8 @@ let }; TryTiny = buildPerlPackage { - name = "Try-Tiny-0.30"; + pname = "Try-Tiny"; + version = "0.30"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/Try-Tiny-0.30.tar.gz; sha256 = "da5bd0d5c903519bbf10bb9ba0cb7bcac0563882bcfe4503aee3fb143eddef6b"; @@ -17182,8 +18494,9 @@ let }; }; - Twiggy = buildPerlPackage rec { - name = "Twiggy-0.1025"; + Twiggy = buildPerlPackage { + pname = "Twiggy"; + version = "0.1025"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Twiggy-0.1025.tar.gz; sha256 = "1a57knbwync7rlzhsz1kdc0sd380xnaccwgiy1qwj5d87abdynnp"; @@ -17198,7 +18511,8 @@ let }; TypeTiny = buildPerlPackage { - name = "Type-Tiny-1.004004"; + pname = "Type-Tiny"; + version = "1.004004"; src = fetchurl { url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.004004.tar.gz; sha256 = "081281ea004cdd89003d938aa52c1398e24411dd8f7163b14d0977a13f7062be"; @@ -17210,8 +18524,9 @@ let }; }; - TypesSerialiser = buildPerlPackage rec { - name = "Types-Serialiser-1.0"; + TypesSerialiser = buildPerlPackage { + pname = "Types-Serialiser"; + version = "1.0"; src = fetchurl { url = mirror://cpan/authors/id/M/ML/MLEHMANN/Types-Serialiser-1.0.tar.gz; sha256 = "03bk0hm5ys8k7265dkap825ybn2zmzb1hl0kf1jdm8yq95w39lvs"; @@ -17222,7 +18537,8 @@ let }; UNIVERSALcan = buildPerlPackage { - name = "UNIVERSAL-can-1.20140328"; + pname = "UNIVERSAL-can"; + version = "1.20140328"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.20140328.tar.gz; sha256 = "522da9f274786fe2cba99bc77cc1c81d2161947903d7fad10bd62dfb7f11990f"; @@ -17235,7 +18551,8 @@ let }; UNIVERSALisa = buildPerlPackage { - name = "UNIVERSAL-isa-1.20171012"; + pname = "UNIVERSAL-isa"; + version = "1.20171012"; src = fetchurl { url = mirror://cpan/authors/id/E/ET/ETHER/UNIVERSAL-isa-1.20171012.tar.gz; sha256 = "0avzv9j32aab6l0rd63n92v0pgliz1p4yabxxjfq275hdh1mcsfi"; @@ -17247,10 +18564,11 @@ let }; }; - UNIVERSALrequire = buildPerlPackage rec { - name = "UNIVERSAL-require-0.18"; + UNIVERSALrequire = buildPerlPackage { + pname = "UNIVERSAL-require"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.18.tar.gz; sha256 = "b2a736a87967a143dab58c8a110501d5235bcdd2c8b2a3bfffcd3c0bd06b38ed"; }; meta = { @@ -17259,10 +18577,11 @@ let }; }; - UnicodeCaseFold = buildPerlModule rec { - name = "Unicode-CaseFold-1.01"; + UnicodeCaseFold = buildPerlModule { + pname = "Unicode-CaseFold"; + version = "1.01"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AR/ARODLAND/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AR/ARODLAND/Unicode-CaseFold-1.01.tar.gz; sha256 = "418a212808f9d0b8bb330ac905096d2dd364976753d4c71534dab9836a63194d"; }; meta = { @@ -17272,17 +18591,19 @@ let }; UnicodeCheckUTF8 = buildPerlPackage { - name = "Unicode-CheckUTF8-1.03"; + pname = "Unicode-CheckUTF8"; + version = "1.03"; src = fetchurl { url = mirror://cpan/authors/id/B/BR/BRADFITZ/Unicode-CheckUTF8-1.03.tar.gz; sha256 = "97f84daf033eb9b49cd8fe31db221fef035a5c2ee1d757f3122c88cf9762414c"; }; }; - UnicodeLineBreak = buildPerlPackage rec { - name = "Unicode-LineBreak-2019.001"; + UnicodeLineBreak = buildPerlPackage { + pname = "Unicode-LineBreak"; + version = "2019.001"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEZUMI/${name}.tar.gz"; + url = mirror://cpan/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2019.001.tar.gz; sha256 = "12iinva5gqc9g7qzxrvmh45n714z0ad9g7wq2dxwgp6drbj64rs8"; }; propagatedBuildInputs = [ MIMECharset ]; @@ -17292,8 +18613,9 @@ let }; }; - UnicodeString = buildPerlPackage rec { - name = "Unicode-String-2.10"; + UnicodeString = buildPerlPackage { + pname = "Unicode-String"; + version = "2.10"; src = fetchurl { url = mirror://cpan/authors/id/G/GA/GAAS/GAAS/Unicode-String-2.10.tar.gz; sha256 = "0s4vp8k7ag7z9lsnnkpa9mnch83kxhp9gh7yiapld5a7rq712jl9"; @@ -17301,15 +18623,17 @@ let }; UnixGetrusage = buildPerlPackage { - name = "Unix-Getrusage-0.03"; + pname = "Unix-Getrusage"; + version = "0.03"; src = fetchurl { url = mirror://cpan/authors/id/T/TA/TAFFY/Unix-Getrusage-0.03.tar.gz; sha256 = "76cde1cee2453260b85abbddc27cdc9875f01d2457e176e03dcabf05fb444d12"; }; }; - URI = buildPerlPackage rec { - name = "URI-1.76"; + URI = buildPerlPackage { + pname = "URI"; + version = "1.76"; src = fetchurl { url = mirror://cpan/authors/id/O/OA/OALDERS/URI-1.76.tar.gz; sha256 = "b2c98e1d50d6f572483ee538a6f4ccc8d9185f91f0073fd8af7390898254413e"; @@ -17323,7 +18647,8 @@ let }; URIdb = buildPerlModule { - name = "URI-db-0.19"; + pname = "URI-db"; + version = "0.19"; src = fetchurl { url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.19.tar.gz; sha256 = "c4999deaf451652216032c8e327ff6e6d655539eac379095bb69b0c369efa658"; @@ -17335,10 +18660,11 @@ let }; }; - URIFind = buildPerlModule rec { - name = "URI-Find-20160806"; + URIFind = buildPerlModule { + pname = "URI-Find"; + version = "20160806"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHWERN/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MS/MSCHWERN/URI-Find-20160806.tar.gz; sha256 = "1mk3jv8x0mcq3ajrn9garnxd0jc7sw4pkwqi88r5apqvlljs84z2"; }; propagatedBuildInputs = [ URI ]; @@ -17349,7 +18675,8 @@ let }; URIFromHash = buildPerlPackage { - name = "URI-FromHash-0.05"; + pname = "URI-FromHash"; + version = "0.05"; src = fetchurl { url = mirror://cpan/authors/id/D/DR/DROLSKY/URI-FromHash-0.05.tar.gz; sha256 = "1l3g5ygv83vn9y1zpwjdqq5cs4ip2q058q0gmpcf5wp9rsycbjm7"; @@ -17362,17 +18689,19 @@ let buildInputs = [ TestFatal ]; }; - UriGoogleChart = buildPerlPackage rec { - name = "URI-GoogleChart-1.02"; + UriGoogleChart = buildPerlPackage { + pname = "URI-GoogleChart"; + version = "1.02"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GA/GAAS/URI-GoogleChart-1.02.tar.gz; sha256 = "00hq5cpsk7sa04n0wg52qhpqf9i2849yyvw2zk83ayh1qqpc50js"; }; propagatedBuildInputs = [ URI ]; }; - UserIdentity = buildPerlPackage rec { - name = "User-Identity-0.99"; + UserIdentity = buildPerlPackage { + pname = "User-Identity"; + version = "0.99"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-0.99.tar.gz; sha256 = "0c2qwxgpqncm4ya3rb5zz2hgiwwf559j1b1a6llyarf9jy43hfzm"; @@ -17384,7 +18713,8 @@ let }; URIIMAP = buildPerlPackage { - name = "URI-imap-1.01"; + pname = "URI-imap"; + version = "1.01"; src = fetchurl { url = mirror://cpan/authors/id/C/CW/CWEST/URI-imap-1.01.tar.gz; sha256 = "0bdv6mrdijcq46r3lmz801rscs63f8p9qqliy2safd6fds4rj55v"; @@ -17393,7 +18723,8 @@ let }; URINested = buildPerlModule { - name = "URI-Nested-0.10"; + pname = "URI-Nested"; + version = "0.10"; src = fetchurl { url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-Nested-0.10.tar.gz; sha256 = "e1971339a65fbac63ab87142d4b59d3d259d51417753c77cb58ea31a8233efaf"; @@ -17405,10 +18736,11 @@ let }; }; - URIws = buildPerlPackage rec { - name = "URI-ws-0.03"; + URIws = buildPerlPackage { + pname = "URI-ws"; + version = "0.03"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/URI-ws-0.03.tar.gz; sha256 = "6e6b0e4172acb6a53c222639c000608c2dd61d50848647482ac8600d50e541ef"; }; propagatedBuildInputs = [ URI ]; @@ -17419,10 +18751,11 @@ let }; }; - UUIDTiny = buildPerlPackage rec { - name = "UUID-Tiny-1.04"; + UUIDTiny = buildPerlPackage { + pname = "UUID-Tiny"; + version = "1.04"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CA/CAUGUSTIN/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CA/CAUGUSTIN/UUID-Tiny-1.04.tar.gz; sha256 = "6dcd92604d64e96cc6c188194ae16a9d3a46556224f77b6f3d1d1312b68f9a3d"; }; meta = { @@ -17431,10 +18764,11 @@ let }; }; - VariableMagic = buildPerlPackage rec { - name = "Variable-Magic-0.62"; + VariableMagic = buildPerlPackage { + pname = "Variable-Magic"; + version = "0.62"; src = fetchurl { - url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz"; + url = mirror://cpan/authors/id/V/VP/VPIT/Variable-Magic-0.62.tar.gz; sha256 = "3f9a18517e33f006a9c2fc4f43f01b54abfe6ff2eae7322424f31069296b615c"; }; meta = { @@ -17443,10 +18777,11 @@ let }; }; - version = buildPerlPackage rec { - name = "version-0.9924"; + Version = buildPerlPackage { + pname = "version"; + version = "0.9924"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JP/JPEACOCK/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JP/JPEACOCK/version-0.9924.tar.gz; sha256 = "81e4485ff3faf9b7813584d57b557f4b34e73b6c2eb696394f6deefacf5ca65b"; }; meta = { @@ -17455,10 +18790,11 @@ let }; }; - vidir = buildPerlPackage rec { - name = "vidir-0.040"; + vidir = buildPerlPackage { + pname = "App-vidir"; + version = "0.040"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WO/WOLDRICH/App-${name}-woldrich.tar.gz"; + url = "mirror://cpan/authors/id/W/WO/WOLDRICH/App-vivid-0.040-woldrich.tar.gz"; sha256 = "0c97yx33pyhskbmwpqbwlkxr85awd6kg1baibvqkarhhvc8v7l0h"; }; # NB: This preInstall a workaround for a problem that is fixed in HEAD. @@ -17473,10 +18809,11 @@ let }; }; - VMEC2 = buildPerlModule rec { - name = "VM-EC2-1.28"; + VMEC2 = buildPerlModule { + pname = "VM-EC2"; + version = "1.28"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz"; + url = mirror://cpan/authors/id/L/LD/LDS/VM-EC2-1.28.tar.gz; sha256 = "b2b6b31745c57431fca0efb9b9d0b8f168d6081755e048fd9d6c4469bd108acd"; }; propagatedBuildInputs = [ AnyEventCacheDNS AnyEventHTTP JSON StringApprox XMLSimple ]; @@ -17486,10 +18823,11 @@ let }; }; - VMEC2SecurityCredentialCache = buildPerlPackage rec { - name = "VM-EC2-Security-CredentialCache-0.25"; + VMEC2SecurityCredentialCache = buildPerlPackage { + pname = "VM-EC2-Security-CredentialCache"; + version = "0.25"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RC/RCONOVER/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RC/RCONOVER/VM-EC2-Security-CredentialCache-0.25.tar.gz; sha256 = "fc7e9c152ff2b721ccb221ac40089934775cf58366aedb5cc1693609f840937b"; }; propagatedBuildInputs = [ DateTimeFormatISO8601 VMEC2 ]; @@ -17499,10 +18837,11 @@ let }; }; - W3CLinkChecker = buildPerlPackage rec { - name = "W3C-LinkChecker-4.81"; + W3CLinkChecker = buildPerlPackage { + pname = "W3C-LinkChecker"; + version = "4.81"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SC/SCOP/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SC/SCOP/W3C-LinkChecker-4.81.tar.gz; sha256 = "6239f61b20d91dce7b21e4d4f626ab93a8f1e2f207da5015590d508cf6c66a65"; }; outputs = [ "out" ]; @@ -17514,10 +18853,11 @@ let }; }; - WWWCurl = buildPerlPackage rec { - name = "WWW-Curl-4.17"; + WWWCurl = buildPerlPackage { + pname = "WWW-Curl"; + version = "4.17"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SZ/SZBALINT/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SZ/SZBALINT/WWW-Curl-4.17.tar.gz; sha256 = "1fmp9aib1kaps9vhs4dwxn7b15kgnlz9f714bxvqsd1j1q8spzsj"; }; patches = [ ../development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch ]; @@ -17531,8 +18871,9 @@ let doCheck = false; # performs network access }; - WWWFormUrlEncoded = buildPerlModule rec { - name = "WWW-Form-UrlEncoded-0.25"; + WWWFormUrlEncoded = buildPerlModule { + pname = "WWW-Form-UrlEncoded"; + version = "0.25"; src = fetchurl { url = mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.25.tar.gz; sha256 = "0kh7qrskhbk4j253pr2q4vpn73q5k6fj517m3lnj8n755z9adxz1"; @@ -17545,7 +18886,8 @@ let }; WWWMechanize = buildPerlPackage { - name = "WWW-Mechanize-1.91"; + pname = "WWW-Mechanize"; + version = "1.91"; src = fetchurl { url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.91.tar.gz; sha256 = "0cb14m1vhaf0mgn2fqwi5hm72xhfi77hpq2g57swgy0w83x7m27b"; @@ -17561,7 +18903,8 @@ let }; WWWMechanizeCGI = buildPerlPackage { - name = "WWW-Mechanize-CGI-0.3"; + pname = "WWW-Mechanize-CGI"; + version = "0.3"; src = fetchurl { url = mirror://cpan/authors/id/M/MR/MRAMBERG/WWW-Mechanize-CGI-0.3.tar.gz; sha256 = "046jm18liq7rwkdawdh9520cnalkfrk26yqryp7xgw71y65lvq61"; @@ -17574,7 +18917,8 @@ let }; WWWRobotRules = buildPerlPackage { - name = "WWW-RobotRules-6.02"; + pname = "WWW-RobotRules"; + version = "6.02"; src = fetchurl { url = mirror://cpan/authors/id/G/GA/GAAS/WWW-RobotRules-6.02.tar.gz; sha256 = "07m50dp5n5jxv3m93i55qvnd67a6g7cvbvlik115kmc8lbkh5da6"; @@ -17587,13 +18931,13 @@ let }; WWWYoutubeViewer = buildPerlPackage rec { - name = "WWW-YoutubeViewer-${version}"; + pname = "WWW-YoutubeViewer"; version = "3.3.0"; src = fetchFromGitHub { owner = "trizen"; repo = "youtube-viewer"; - rev = "${version}"; + rev = version; sha256 = "15xyrwv08fw8jmpydwzks26ipxnzliwddgyjcfqiaj0p7lwlhmx1"; }; @@ -17612,18 +18956,20 @@ let }; }; - Want = buildPerlPackage rec { - name = "Want-0.29"; + Want = buildPerlPackage { + pname = "Want"; + version = "0.29"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROBIN/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RO/ROBIN/Want-0.29.tar.gz; sha256 = "1xsjylbxxcbkjazqms49ipi94j1hd2ykdikk29cq7dscil5p9r5l"; }; }; - Win32ShellQuote = buildPerlPackage rec { - name = "Win32-ShellQuote-0.003001"; + Win32ShellQuote = buildPerlPackage { + pname = "Win32-ShellQuote"; + version = "0.003001"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; + url = mirror://cpan/authors/id/H/HA/HAARG/Win32-ShellQuote-0.003001.tar.gz; sha256 = "aa74b0e3dc2d41cd63f62f853e521ffd76b8d823479a2619e22edb4049b4c0dc"; }; meta = { @@ -17632,10 +18978,11 @@ let }; }; - Workflow = buildPerlModule rec { - name = "Workflow-1.45"; + Workflow = buildPerlModule { + pname = "Workflow"; + version = "1.45"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JO/JONASBN/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JO/JONASBN/Workflow-1.45.tar.gz; sha256 = "0w814z4j85gghzqnbxzsr60m8dbqc02yi7137sq58lhbsfshmvhx"; }; buildInputs = [ DBDMock ListMoreUtils PodCoverageTrustPod TestException TestKwalitee TestPod TestPodCoverage ]; @@ -17647,10 +18994,11 @@ let }; }; - Wx = buildPerlPackage rec { - name = "Wx-0.9932"; + Wx = buildPerlPackage { + pname = "Wx"; + version = "0.9932"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MD/MDOOTSON/Wx-0.9932.tar.gz; sha256 = "0w0vcpk8bmklh16c0z1vxgipnmvdw7cckcmay7k7cihgb99vdz8w"; }; propagatedBuildInputs = [ AlienWxWidgets ]; @@ -17660,20 +19008,22 @@ let buildInputs = [ ExtUtilsXSpp ]; }; - WxGLCanvas = buildPerlPackage rec { - name = "Wx-GLCanvas-0.09"; + WxGLCanvas = buildPerlPackage { + pname = "Wx-GLCanvas"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MB/MBARBON/Wx-GLCanvas-0.09.tar.gz; sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; }; propagatedBuildInputs = [ pkgs.libGLU Wx ]; doCheck = false; }; - X11IdleTime = buildPerlPackage rec { - name = "X11-IdleTime-0.09"; + X11IdleTime = buildPerlPackage { + pname = "X11-IdleTime"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AW/AWENDT/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AW/AWENDT/X11-IdleTime-0.09.tar.gz; sha256 = "0j27cb9yy9ymni8cbiyxplbg086b8lv6b330nwqyx0briq3xrzfq"; }; buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ]; @@ -17684,10 +19034,11 @@ let }; }; - X11Protocol = buildPerlPackage rec { - name = "X11-Protocol-0.56"; + X11Protocol = buildPerlPackage { + pname = "X11-Protocol"; + version = "0.56"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SM/SMCCAM/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SM/SMCCAM/X11-Protocol-0.56.tar.gz; sha256 = "1dq89bh6fqv7l5mbffqcismcljpq5f869bx7g8lg698zgindv5ny"; }; buildInputs = [ pkgs.xlibsWrapper ]; @@ -17695,10 +19046,11 @@ let doCheck = false; # requires an X server }; - X11GUITest = buildPerlPackage rec { - name = "X11-GUITest-0.28"; + X11GUITest = buildPerlPackage { + pname = "X11-GUITest"; + version = "0.28"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CT/CTRONDLP/${name}.tar.gz"; + url = mirror://cpan/authors/id/C/CT/CTRONDLP/X11-GUITest-0.28.tar.gz; sha256 = "0jznws68skdzkhgkgcgjlj40qdyh9i75r7fw8bqzy406f19xxvnw"; }; buildInputs = [ pkgs.xlibsWrapper pkgs.xorg.libXtst pkgs.xorg.libXi ]; @@ -17706,10 +19058,11 @@ let doCheck = false; # requires an X server }; - X11XCB = buildPerlPackage rec { - name = "X11-XCB-0.18"; + X11XCB = buildPerlPackage { + pname = "X11-XCB"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MS/MSTPLBG/X11-XCB-0.18.tar.gz; sha256 = "1cjpghw7cnackw20lbd7yzm222kz5bnrwz52f8ay24d1f4pwrnxf"; }; AUTOMATED_TESTING = false; @@ -17723,10 +19076,11 @@ let }; }; - XMLDescent = buildPerlModule rec { - name = "XML-Descent-1.04"; + XMLDescent = buildPerlModule { + pname = "XML-Descent"; + version = "1.04"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AN/ANDYA/XML-Descent-1.04.tar.gz; sha256 = "0l5xmw2hd95ypppz3lyvp4sn02ccsikzjwacli3ydxfdz1bbh4d7"; }; buildInputs = [ TestDifferences ]; @@ -17737,19 +19091,21 @@ let }; }; - XMLDOM = buildPerlPackage rec { - name = "XML-DOM-1.46"; + XMLDOM = buildPerlPackage { + pname = "XML-DOM"; + version = "1.46"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TJ/TJMATHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TJ/TJMATHER/XML-DOM-1.46.tar.gz; sha256 = "0phpkc4li43m2g44hdcvyxzy9pymqwlqhh5hwp2xc0cv8l5lp8lb"; }; propagatedBuildInputs = [ XMLRegExp libxml_perl ]; }; - XMLFeedPP = buildPerlPackage rec { - name = "XML-FeedPP-0.95"; + XMLFeedPP = buildPerlPackage { + pname = "XML-FeedPP"; + version = "0.95"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MARKOV/XML-FeedPP-0.95.tar.gz; sha256 = "1x5806xwmbqxr1dkdhalb6d7n31s3ya776klkai7c2x6y6drbhwh"; }; propagatedBuildInputs = [ XMLTreePP ]; @@ -17760,7 +19116,8 @@ let }; XMLFilterBufferText = buildPerlPackage { - name = "XML-Filter-BufferText-1.01"; + pname = "XML-Filter-BufferText"; + version = "1.01"; src = fetchurl { url = mirror://cpan/authors/id/R/RB/RBERJON/XML-Filter-BufferText-1.01.tar.gz; sha256 = "8fd2126d3beec554df852919f4739e689202cbba6a17506e9b66ea165841a75c"; @@ -17769,7 +19126,8 @@ let }; XMLFilterXInclude = buildPerlPackage { - name = "XML-Filter-XInclude-1.0"; + pname = "XML-Filter-XInclude"; + version = "1.0"; src = fetchurl { url = mirror://cpan/authors/id/M/MS/MSERGEANT/XML-Filter-XInclude-1.0.tar.gz; sha256 = "98746f3c1f6f049491fec203d455bb8f8c9c6e250f041904dda5d78e21187f93"; @@ -17777,10 +19135,11 @@ let doCheck = false; }; - XMLGrove = buildPerlPackage rec { - name = "XML-Grove-0.46alpha"; + XMLGrove = buildPerlPackage { + pname = "XML-Grove"; + version = "0.46alpha"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KM/KMACLEOD/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KM/KMACLEOD/XML-Grove-0.46alpha.tar.gz; sha256 = "05yis1ms7cgwjh57k57whrmalb3ha0bjr9hyvh7cnadcyiynvdpw"; }; buildInputs = [ pkgs.libxml2 ]; @@ -17793,10 +19152,11 @@ let }; }; - XMLHandlerYAWriter = buildPerlPackage rec { - name = "XML-Handler-YAWriter-0.23"; + XMLHandlerYAWriter = buildPerlPackage { + pname = "XML-Handler-YAWriter"; + version = "0.23"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KR/KRAEHE/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KR/KRAEHE/XML-Handler-YAWriter-0.23.tar.gz; sha256 = "11d45a1sz862va9rry3p2m77pwvq3kpsvgwhc5ramh9mbszbnk77"; }; propagatedBuildInputs = [ libxml_perl ]; @@ -17805,10 +19165,11 @@ let }; }; - XMLLibXML = buildPerlPackage rec { - name = "XML-LibXML-2.0134"; + XMLLibXML = buildPerlPackage { + pname = "XML-LibXML"; + version = "2.0134"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0134.tar.gz; sha256 = "1ks69xymv6zkj7hvaymjvb78ch81abri7kg4zrwxhdfsqb8a9g7h"; }; SKIP_SAX_INSTALL = 1; @@ -17822,7 +19183,8 @@ let }; XMLLibXMLSimple = buildPerlPackage { - name = "XML-LibXML-Simple-0.99"; + pname = "XML-LibXML-Simple"; + version = "0.99"; src = fetchurl { url = mirror://cpan/authors/id/M/MA/MARKOV/XML-LibXML-Simple-0.99.tar.gz; sha256 = "14fe45c9fcb36c1cf14ac922da4439f1f83d451a5e70aa7177cb6edb705c9e44"; @@ -17834,20 +19196,22 @@ let }; }; - XMLLibXSLT = buildPerlPackage rec { - name = "XML-LibXSLT-1.96"; + XMLLibXSLT = buildPerlPackage { + pname = "XML-LibXSLT"; + version = "1.96"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.96.tar.gz; sha256 = "0wyl8klgr65j8y8fzgwz9jlvfjwvxazna8j3dg9gksd2v973fpia"; }; buildInputs = [ pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; propagatedBuildInputs = [ XMLLibXML ]; }; - XMLMini = buildPerlPackage rec { - name = "XML-Mini-1.38"; + XMLMini = buildPerlPackage { + pname = "XML-Mini"; + version = "1.38"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PD/PDEEGAN/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PD/PDEEGAN/XML-Mini-1.38.tar.gz; sha256 = "af803d38036a3184e124a682e5466f1bc107f48a89ef35b0c7647e11a073fe2d"; }; meta = { @@ -17856,7 +19220,8 @@ let }; XMLNamespaceSupport = buildPerlPackage { - name = "XML-NamespaceSupport-1.12"; + pname = "XML-NamespaceSupport"; + version = "1.12"; src = fetchurl { url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.12.tar.gz; sha256 = "1vz5pbi4lm5fhq2slrs2hlp6bnk29863abgjlcx43l4dky2rbsa7"; @@ -17864,7 +19229,8 @@ let }; XMLParser = buildPerlPackage { - name = "XML-Parser-2.44"; + pname = "XML-Parser"; + version = "2.44"; src = fetchurl { url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz; sha256 = "05ij0g6bfn27iaggxf8nl5rhlwx6f6p6xmdav6rjcly3x5zd1s8s"; @@ -17879,7 +19245,8 @@ let }; XMLParserLite = buildPerlPackage { - name = "XML-Parser-Lite-0.722"; + pname = "XML-Parser-Lite"; + version = "0.722"; src = fetchurl { url = mirror://cpan/authors/id/P/PH/PHRED/XML-Parser-Lite-0.722.tar.gz; sha256 = "1vk3jwh1kfcsmc5kvxzqdnb1cllvf0yf27fg0ra0w6jkw4ks143g"; @@ -17891,10 +19258,11 @@ let }; }; - XMLXPath = buildPerlPackage rec { - name = "XML-XPath-1.44"; + XMLXPath = buildPerlPackage { + pname = "XML-XPath"; + version = "1.44"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MANWAR/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MANWAR/XML-XPath-1.44.tar.gz; sha256 = "1cc9110705165dc09dd09974dd7c0b6709c9351d6b6b1cef5a711055f891dd0f"; }; buildInputs = [ PathTiny ]; @@ -17906,7 +19274,8 @@ let }; XMLXPathEngine = buildPerlPackage { - name = "XML-XPathEngine-0.14"; + pname = "XML-XPathEngine"; + version = "0.14"; src = fetchurl { url = mirror://cpan/authors/id/M/MI/MIROD/XML-XPathEngine-0.14.tar.gz; sha256 = "0r72na14bmsxfd16s9nlza155amqww0k8wsa9x2a3sqbpp5ppznj"; @@ -17917,7 +19286,8 @@ let }; XMLRegExp = buildPerlPackage { - name = "XML-RegExp-0.04"; + pname = "XML-RegExp"; + version = "0.04"; src = fetchurl { url = mirror://cpan/authors/id/T/TJ/TJMATHER/XML-RegExp-0.04.tar.gz; sha256 = "0m7wj00a2kik7wj0azhs1zagwazqh3hlz4255n75q21nc04r06fz"; @@ -17925,7 +19295,8 @@ let }; XMLRSS = buildPerlModule { - name = "XML-RSS-1.60"; + pname = "XML-RSS"; + version = "1.60"; src = fetchurl { url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.60.tar.gz; sha256 = "4b3359878bb1a2bc06dae7ed17b00143a2b89c814b8b12f6e2780f35b1528677"; @@ -17939,7 +19310,8 @@ let }; XMLSAX = buildPerlPackage { - name = "XML-SAX-1.00"; + pname = "XML-SAX"; + version = "1.00"; src = fetchurl { url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-1.00.tar.gz; sha256 = "1qra9k3wszjxvsgbragl55z3qba4nri0ipmjaxfib4l6xxj6bsj5"; @@ -17951,7 +19323,8 @@ let }; XMLSAXBase = buildPerlPackage { - name = "XML-SAX-Base-1.09"; + pname = "XML-SAX-Base"; + version = "1.09"; src = fetchurl { url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-Base-1.09.tar.gz; sha256 = "66cb355ba4ef47c10ca738bd35999723644386ac853abbeb5132841f5e8a2ad0"; @@ -17963,8 +19336,9 @@ let }; }; - XMLSAXExpat = buildPerlPackage rec { - name = "XML-SAX-Expat-0.51"; + XMLSAXExpat = buildPerlPackage { + pname = "XML-SAX-Expat"; + version = "0.51"; src = fetchurl { url = mirror://cpan/authors/id/B/BJ/BJOERN/XML-SAX-Expat-0.51.tar.gz; sha256 = "0gy8h2bvvvlxychwsb99ikdh5cqpk6sqc073jk2b4zffs09n40ac"; @@ -17977,7 +19351,8 @@ let }; XMLSAXWriter = buildPerlPackage { - name = "XML-SAX-Writer-0.57"; + pname = "XML-SAX-Writer"; + version = "0.57"; src = fetchurl { url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-0.57.tar.gz; sha256 = "3d61d07ef43b0126f5b4de4f415a256fa859fa88dc4fdabaad70b7be7c682cf0"; @@ -17991,7 +19366,8 @@ let }; XMLSemanticDiff = buildPerlModule { - name = "XML-SemanticDiff-1.0007"; + pname = "XML-SemanticDiff"; + version = "1.0007"; src = fetchurl { url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SemanticDiff-1.0007.tar.gz; sha256 = "1xd00821y795fy2rag8aizb5wsbbzfxgmdf9qwpvdxn3pgpyzz85"; @@ -18000,7 +19376,8 @@ let }; XMLSimple = buildPerlPackage { - name = "XML-Simple-2.25"; + pname = "XML-Simple"; + version = "2.25"; src = fetchurl { url = mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.25.tar.gz; sha256 = "1y6vh328zrh085d40852v4ij2l4g0amxykswxd1nfhd2pspds7sk"; @@ -18008,10 +19385,11 @@ let propagatedBuildInputs = [ XMLSAXExpat ]; }; - XMLTokeParser = buildPerlPackage rec { - name = "XML-TokeParser-0.05"; + XMLTokeParser = buildPerlPackage { + pname = "XML-TokeParser"; + version = "0.05"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PO/PODMASTER/${name}.tar.gz"; + url = mirror://cpan/authors/id/P/PO/PODMASTER/XML-TokeParser-0.05.tar.gz; sha256 = "1hnpwb3lh6cbgwvjjgqzcp6jm4mp612qn6ili38adc9nhkwv8fc5"; }; propagatedBuildInputs = [ XMLParser ]; @@ -18021,10 +19399,11 @@ let }; }; - XMLTreePP = buildPerlPackage rec { - name = "XML-TreePP-0.43"; + XMLTreePP = buildPerlPackage { + pname = "XML-TreePP"; + version = "0.43"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KA/KAWASAKI/${name}.tar.gz"; + url = mirror://cpan/authors/id/K/KA/KAWASAKI/XML-TreePP-0.43.tar.gz; sha256 = "7fbe2d6430860059894aeeebf75d4cacf1bf8d7b75294eb87d8e1502f81bd760"; }; propagatedBuildInputs = [ LWP ]; @@ -18034,10 +19413,11 @@ let }; }; - XMLTwig = buildPerlPackage rec { - name = "XML-Twig-3.52"; + XMLTwig = buildPerlPackage { + pname = "XML-Twig"; + version = "3.52"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIROD/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.52.tar.gz; sha256 = "1bc0hrz4jp6199hi29sdxmb9gyy45whla9hd19yqfasgq8k5ixzy"; }; propagatedBuildInputs = [ XMLParser ]; @@ -18045,7 +19425,8 @@ let }; XMLValidatorSchema = buildPerlPackage { - name = "XML-Validator-Schema-1.10"; + pname = "XML-Validator-Schema"; + version = "1.10"; src = fetchurl { url = mirror://cpan/authors/id/S/SA/SAMTREGAR/XML-Validator-Schema-1.10.tar.gz; sha256 = "6142679580150a891f7d32232b5e31e2b4e5e53e8a6fa9cbeecb5c23814f1422"; @@ -18056,18 +19437,20 @@ let }; }; - XMLWriter = buildPerlPackage rec { - name = "XML-Writer-0.625"; + XMLWriter = buildPerlPackage { + pname = "XML-Writer"; + version = "0.625"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JO/JOSEPHW/${name}.tar.gz"; + url = mirror://cpan/authors/id/J/JO/JOSEPHW/XML-Writer-0.625.tar.gz; sha256 = "1gjzs570i67ywbv967g8ylb5sg59clwmyrl2yix3jl70dhn55070"; }; }; - XSObjectMagic = buildPerlPackage rec { - name = "XS-Object-Magic-0.04"; + XSObjectMagic = buildPerlPackage { + pname = "XS-Object-Magic"; + version = "0.04"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FL/FLORA/XS-Object-Magic-0.04.tar.gz; sha256 = "03fghj7hq0fiicmfdxhmzfm4mzv7s097pgkd32ji7jnljvhm9six"; }; buildInputs = [ ExtUtilsDepends TestFatal ]; @@ -18077,8 +19460,9 @@ let }; }; - YAML = buildPerlPackage rec { - name = "YAML-1.27"; + YAML = buildPerlPackage { + pname = "YAML"; + version = "1.27"; src = fetchurl { url = mirror://cpan/authors/id/T/TI/TINITA/YAML-1.27.tar.gz; sha256 = "1yc2yqjyrcdlhp209f3a63f9xx6v5klisli25fv221yy43la34n9"; @@ -18093,10 +19477,11 @@ let }; }; - YAMLSyck = buildPerlPackage rec { - name = "YAML-Syck-1.31"; + YAMLSyck = buildPerlPackage { + pname = "YAML-Syck"; + version = "1.31"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.31.tar.gz; sha256 = "14420hp7vxhrs0hgsmrfc9s9dassw1bns4jbmdq55b735xrwbbfp"; }; meta = { @@ -18105,26 +19490,29 @@ let }; }; - YAMLTiny = buildPerlPackage rec { - name = "YAML-Tiny-1.73"; + YAMLTiny = buildPerlPackage { + pname = "YAML-Tiny"; + version = "1.73"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + url = mirror://cpan/authors/id/E/ET/ETHER/YAML-Tiny-1.73.tar.gz; sha256 = "0i3p4nz8ysrsrs6vlzc6gkjcfpcaf05xjc7lwbjkw7lg5shmycdw"; }; }; - YAMLLibYAML = buildPerlPackage rec { - name = "YAML-LibYAML-0.77"; + YAMLLibYAML = buildPerlPackage { + pname = "YAML-LibYAML"; + version = "0.77"; src = fetchurl { url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.77.tar.gz; sha256 = "04wfa78i3r6gznl47gj3qvsa1ixdas7l7c5c3n5mwm81wi4d9vsi"; }; }; - WebServiceLinode = buildPerlModule rec { - name = "WebService-Linode-0.28"; + WebServiceLinode = buildPerlModule { + pname = "WebService-Linode"; + version = "0.28"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIKEGRB/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIKEGRB/WebService-Linode-0.28.tar.gz; sha256 = "66a315016999c0d2043caae86e664dad10c6613708f33a2f56aae8030326c509"; }; buildInputs = [ ModuleBuildTiny ]; @@ -18220,5 +19608,6 @@ let TestTester = self.TestSimple; Testuseok = self.TestSimple; SubExporterUtil = self.SubExporter; + version = self.Version; }; in self -- cgit 1.4.1 From 69f1914ab76db093626d863ffc630725591a66c3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 20 Jun 2019 23:46:13 -0500 Subject: postgresql_9_4: 9.4.22 -> 9.4.23 --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 701670187b60..d42a80cfc1c8 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -162,9 +162,9 @@ let in self: { postgresql_9_4 = self.callPackage generic { - version = "9.4.22"; + version = "9.4.23"; psqlSchema = "9.4"; - sha256 = "0sy66cl2nkqr1al66f3qy7zsyd3vjpjv0icqbda7bqq4j8mlrann"; + sha256 = "16qx4gfq7i2nnxm0i3zxpb3z1mmzx05a3fsh95414ay8n049q00d"; this = self.postgresql_9_4; inherit self; }; -- cgit 1.4.1 From 14de736372af3d316215000c7101920f23ccfc60 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 20 Jun 2019 23:46:39 -0500 Subject: postgresql_9_5: 9.5.17 -> 9.5.18 --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index d42a80cfc1c8..199e1a6c1cc8 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -170,9 +170,9 @@ in self: { }; postgresql_9_5 = self.callPackage generic { - version = "9.5.17"; + version = "9.5.18"; psqlSchema = "9.5"; - sha256 = "01gp4d3ngl2809dl652md2n1q4nk27cdbl6i892gvwk901xf7yc8"; + sha256 = "1pgkz794wmp4f40843sbin49k5lgl59jvl6nazvdbb6mgr441jfz"; this = self.postgresql_9_5; inherit self; }; -- cgit 1.4.1 From 0f612b8ec4beb107694df8f314505696b375932e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 20 Jun 2019 23:47:08 -0500 Subject: postgresql_9_6: 9.6.13 -> 9.6.14 --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 199e1a6c1cc8..c1d1755d81d9 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -178,9 +178,9 @@ in self: { }; postgresql_9_6 = self.callPackage generic { - version = "9.6.13"; + version = "9.6.14"; psqlSchema = "9.6"; - sha256 = "197964wb5pc5fx81a6mh9hlcrr9sgr3nqlpmljv6asi9aq0d5gpc"; + sha256 = "08hsqczy1ixkjyf2vr3s9x69agfz9yr8lh31fir4z0dfr5jw421z"; this = self.postgresql_9_6; inherit self; }; -- cgit 1.4.1 From 76d3cbb096bcc61eb00d285428b5916480b08c31 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 20 Jun 2019 23:47:33 -0500 Subject: postgresql_10: 10.8 -> 10.9 --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index c1d1755d81d9..f30c0305e7ef 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -186,9 +186,9 @@ in self: { }; postgresql_10 = self.callPackage generic { - version = "10.8"; + version = "10.9"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "0pfdmy4w95b49w9rkn8dwvzmi2brpqfvbxd04y0k0s0xvymc565i"; + sha256 = "0m0gbf7nwgag6a1z5f9xszwzgf2xhx0ncakyxwxlzs87n1zk32wm"; this = self.postgresql_10; inherit self; }; -- cgit 1.4.1 From 5ba133ed2ed6c47e2eff34e7332132af7a43704c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 20 Jun 2019 23:47:59 -0500 Subject: postgresql_11: 11.3 -> 11.4 --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index f30c0305e7ef..440ee15a5180 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -194,9 +194,9 @@ in self: { }; postgresql_11 = self.callPackage generic { - version = "11.3"; + version = "11.4"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "0baj61ym7jnl195qcq4hq6225kfz6879j8zx3n148n92zj1f119a"; + sha256 = "12ycjlqncijgmd5z078ybwda8ilas96lc7nxxmdq140mzpgjv002"; this = self.postgresql_11; inherit self; }; -- cgit 1.4.1 From 4fd6cb7abdac13dcb70651dabc33c03f5bc9b16e Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 22 Jun 2019 11:53:12 +0200 Subject: bzip2: patch CVE-2019-12900 The vulnerability seems quite serious. It isn't practical to use fetchpatch here due to bootstrapping, so I just committed the small patch file. --- pkgs/tools/compression/bzip2/cve-2019-12900.patch | 13 +++++++++++++ pkgs/tools/compression/bzip2/default.nix | 1 + 2 files changed, 14 insertions(+) create mode 100644 pkgs/tools/compression/bzip2/cve-2019-12900.patch diff --git a/pkgs/tools/compression/bzip2/cve-2019-12900.patch b/pkgs/tools/compression/bzip2/cve-2019-12900.patch new file mode 100644 index 000000000000..bf3d13a7a691 --- /dev/null +++ b/pkgs/tools/compression/bzip2/cve-2019-12900.patch @@ -0,0 +1,13 @@ +https://gitlab.com/federicomenaquintero/bzip2/commit/74de1e2e6ffc9d +diff --git a/decompress.c b/decompress.c +--- a/decompress.c ++++ b/decompress.c +@@ -287,7 +287,7 @@ + GET_BITS(BZ_X_SELECTOR_1, nGroups, 3); + if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR); + GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15); +- if (nSelectors < 1) RETURN(BZ_DATA_ERROR); ++ if (nSelectors < 1 || nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR); + for (i = 0; i < nSelectors; i++) { + j = 0; + while (True) { diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index ffdbcf463eab..a0ec6c07055b 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { patches = [ ./CVE-2016-3189.patch + ./cve-2019-12900.patch ]; postPatch = '' -- cgit 1.4.1 From 9702cd1acf5cc8e202cd59b5d597bbcc2674c45c Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 22 Jun 2019 14:25:28 -0400 Subject: protobuf: remove 3.4 and 3.5 They have no users in nixpkgs. --- pkgs/development/libraries/protobuf/3.4.nix | 6 ------ pkgs/development/libraries/protobuf/3.5.nix | 6 ------ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 14 deletions(-) delete mode 100644 pkgs/development/libraries/protobuf/3.4.nix delete mode 100644 pkgs/development/libraries/protobuf/3.5.nix diff --git a/pkgs/development/libraries/protobuf/3.4.nix b/pkgs/development/libraries/protobuf/3.4.nix deleted file mode 100644 index 5a9034a56a80..000000000000 --- a/pkgs/development/libraries/protobuf/3.4.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, lib, ... }: - -lib.overrideDerivation (callPackage ./generic-v3.nix { - version = "3.4.1"; - sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb"; -}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) diff --git a/pkgs/development/libraries/protobuf/3.5.nix b/pkgs/development/libraries/protobuf/3.5.nix deleted file mode 100644 index db9cb6f0371b..000000000000 --- a/pkgs/development/libraries/protobuf/3.5.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, lib, ... }: - -lib.overrideDerivation (callPackage ./generic-v3.nix { - version = "3.5.1.1"; - sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk"; -}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1517d9aee08..57ab7b925b2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12646,8 +12646,6 @@ in protobuf3_7 = callPackage ../development/libraries/protobuf/3.7.nix { }; protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { }; - protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { }; - protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { }; protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { }; protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { }; -- cgit 1.4.1 From b14c3eb913ccc28d78eec0ae1ac2d0c1e75038b2 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 22 Jun 2019 16:57:08 -0400 Subject: protobuf: remove obsolete NIX_CFLAGS_COMPILE --- pkgs/development/libraries/protobuf/generic-v3.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 610efcfef298..a98521a2d1ee 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -40,10 +40,6 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec { dontDisableStatic = true; - NIX_CFLAGS_COMPILE = with stdenv.lib; - # gcc before 6 doesn't know this option - optionalString (hasPrefix "gcc-6" stdenv.cc.cc.name) "-Wno-error=misleading-indentation"; - meta = { description = "Google's data interchange format"; longDescription = -- cgit 1.4.1 From 1930f4accae9c2022546d1c53f87480e864c6703 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jun 2019 23:17:21 -0700 Subject: libshout: 2.4.2 -> 2.4.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libshout/versions --- pkgs/development/libraries/libshout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 3753a070c639..849c93962f88 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -4,11 +4,11 @@ # need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc stdenv.mkDerivation rec { - name = "libshout-2.4.2"; + name = "libshout-2.4.3"; src = fetchurl { url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz"; - sha256 = "0qgwarqp2p6jy3zadds6dzj8z1jfb2mbwc3lsdlidf527h0a86ym"; + sha256 = "1zhdshas539cs8fsz8022ljxnnncr5lafhfd1dqr1gs125fzb2hd"; }; outputs = [ "out" "dev" "doc" ]; -- cgit 1.4.1 From d2adb05aa6a20cc9e32baca7014b87acacc27ff4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 24 Jun 2019 00:58:53 +0200 Subject: i3-layout-manager: init at unstable-2019-06-19 Simple script which is a wrapper for i3's layout persist functionality[1] that automates the manual editing of the exported layout JSON. [1] https://i3wm.org/docs/layout-saving.html --- .../window-managers/i3/layout-manager.nix | 39 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/window-managers/i3/layout-manager.nix diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix new file mode 100644 index 000000000000..afa14b48451a --- /dev/null +++ b/pkgs/applications/window-managers/i3/layout-manager.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, vim, makeWrapper, jq, rofi, xrandr, xdotool, i3, gawk, libnotify }: + +let + path = stdenv.lib.makeBinPath [ vim jq rofi xrandr xdotool i3 gawk libnotify ]; +in + +stdenv.mkDerivation rec { + pname = "i3-layout-manager"; + version = "unstable-2019-06-19"; + + src = fetchFromGitHub { + owner = "klaxalk"; + repo = pname; + rev = "80ade872bfd70d9c6039024097ceb8c852a2816a"; + sha256 = "02xhyd737qwni628mjzr9i5v2kga5cq4k8m77bxm1p6kkj84nlmg"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -D layout_manager.sh $out/bin/layout_manager + wrapProgram $out/bin/layout_manager \ + --prefix PATH : "${path}" + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/klaxalk/i3-layout-manager; + description = "Saving, loading and managing layouts for i3wm."; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f90aa516e563..4344decb6328 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18430,6 +18430,8 @@ in i3-easyfocus = callPackage ../applications/window-managers/i3/easyfocus.nix { }; + i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { }; + i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { }; i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { }; -- cgit 1.4.1 From 6a27d63a882d1daecd1dce9e61135ccea3b0696e Mon Sep 17 00:00:00 2001 From: Ding Xiang Fei Date: Fri, 21 Jun 2019 15:33:37 +0800 Subject: buildGoPackage: enable cross compilation --- pkgs/development/go-packages/generic/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 8e016fadface..b3386aaf24bf 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -72,14 +72,19 @@ let goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs else extraSrcs; - package = go.stdenv.mkDerivation ( + package = stdenv.mkDerivation ( (builtins.removeAttrs args [ "goPackageAliases" "disabled" "extraSrcs"]) // { nativeBuildInputs = [ removeReferencesTo go ] ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs; buildInputs = buildInputs; - inherit (go) GOOS GOARCH; + inherit (go) GOOS GOARCH GO386 CGO_ENABLED; + + GOHOSTARCH = go.GOHOSTARCH or null; + GOHOSTOS = go.GOHOSTOS or null; + + GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); configurePhase = args.configurePhase or '' runHook preConfigure -- cgit 1.4.1 From 3c45b0c00a375c7b5b768cb5a6e6ddea2c88c67f Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 12 Jun 2019 17:18:19 -0400 Subject: mesa: extract stubs --- pkgs/development/libraries/mesa/default.nix | 83 +++-------------------------- pkgs/development/libraries/mesa/stubs.nix | 75 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 84 insertions(+), 78 deletions(-) create mode 100644 pkgs/development/libraries/mesa/stubs.nix diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index a35bdb5764bb..2c9a22f709ab 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -68,8 +68,9 @@ let branch = head (splitString "." version); in -let self = stdenv.mkDerivation { - name = "mesa-${version}"; +stdenv.mkDerivation rec { + pname = "mesa"; + inherit version; src = fetchurl { urls = [ @@ -228,80 +229,8 @@ let self = stdenv.mkDerivation { ''; passthru = { - inherit libdrm version; + inherit libdrm; inherit (libglvnd) driverLink; - - # Use stub libraries from libglvnd and headers from Mesa. - stubs = stdenv.mkDerivation { - name = "libGL-${libglvnd.version}"; - outputs = [ "out" "dev" ]; - - # On macOS, libglvnd is not supported, so we just use what mesa - # build. We need to also include OpenGL.framework, and some - # extra tricks to go along with. We add mesa’s libGLX to support - # the X extensions to OpenGL. - buildCommand = if stdenv.hostPlatform.isDarwin then '' - mkdir -p $out/nix-support $dev - echo ${OpenGL} >> $out/nix-support/propagated-build-inputs - ln -s ${self.out}/lib $out/lib - - mkdir -p $dev/lib/pkgconfig $dev/nix-support - echo "$out" > $dev/nix-support/propagated-build-inputs - ln -s ${self.dev}/include $dev/include - - cat <$dev/lib/pkgconfig/gl.pc - Name: gl - Description: gl library - Version: ${self.version} - Libs: -L${self.out}/lib -lGL - Cflags: -I${self.dev}/include - EOF - - cat <$dev/lib/pkgconfig/glesv1_cm.pc - Name: glesv1_cm - Description: glesv1_cm library - Version: ${self.version} - Libs: -L${self.out}/lib -lGLESv1_CM - Cflags: -I${self.dev}/include - EOF - - cat <$dev/lib/pkgconfig/glesv2.pc - Name: glesv2 - Description: glesv2 library - Version: ${self.version} - Libs: -L${self.out}/lib -lGLESv2 - Cflags: -I${self.dev}/include - EOF - '' - - # Otherwise, setup gl stubs to use libglvnd. - else '' - mkdir -p $out/nix-support - ln -s ${libglvnd.out}/lib $out/lib - - mkdir -p $dev/{,lib/pkgconfig,nix-support} - echo "$out" > $dev/nix-support/propagated-build-inputs - ln -s ${self.dev}/include $dev/include - - genPkgConfig() { - local name="$1" - local lib="$2" - - cat <$dev/lib/pkgconfig/$name.pc - Name: $name - Description: $lib library - Version: ${self.version} - Libs: -L${libglvnd.out}/lib -l$lib - Cflags: -I${self.dev}/include - EOF - } - - genPkgConfig gl GL - genPkgConfig egl EGL - genPkgConfig glesv1_cm GLESv1_CM - genPkgConfig glesv2 GLESv2 - ''; - }; }; meta = with stdenv.lib; { @@ -311,5 +240,5 @@ let self = stdenv.mkDerivation { platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ vcunat ]; }; -}; -in self +} + diff --git a/pkgs/development/libraries/mesa/stubs.nix b/pkgs/development/libraries/mesa/stubs.nix new file mode 100644 index 000000000000..5cb6ac3d4d13 --- /dev/null +++ b/pkgs/development/libraries/mesa/stubs.nix @@ -0,0 +1,75 @@ +{ stdenv +, libglvnd, mesa +, OpenGL }: + +stdenv.mkDerivation { + inherit (libglvnd) version; + pname = "libGL"; + outputs = [ "out" "dev" ]; + + # On macOS, libglvnd is not supported, so we just use what mesa + # build. We need to also include OpenGL.framework, and some + # extra tricks to go along with. We add mesa’s libGLX to support + # the X extensions to OpenGL. + buildCommand = if stdenv.hostPlatform.isDarwin then '' + mkdir -p $out/nix-support $dev + echo ${OpenGL} >> $out/nix-support/propagated-build-inputs + ln -s ${mesa.out}/lib $out/lib + + mkdir -p $dev/lib/pkgconfig $dev/nix-support + echo "$out" > $dev/nix-support/propagated-build-inputs + ln -s ${mesa.dev}/include $dev/include + + cat <$dev/lib/pkgconfig/gl.pc + Name: gl + Description: gl library + Version: ${mesa.version} + Libs: -L${mesa.out}/lib -lGL + Cflags: -I${mesa.dev}/include + EOF + + cat <$dev/lib/pkgconfig/glesv1_cm.pc + Name: glesv1_cm + Description: glesv1_cm library + Version: ${mesa.version} + Libs: -L${mesa.out}/lib -lGLESv1_CM + Cflags: -I${mesa.dev}/include + EOF + + cat <$dev/lib/pkgconfig/glesv2.pc + Name: glesv2 + Description: glesv2 library + Version: ${mesa.version} + Libs: -L${mesa.out}/lib -lGLESv2 + Cflags: -I${mesa.dev}/include + EOF + '' + + # Otherwise, setup gl stubs to use libglvnd. + else '' + mkdir -p $out/nix-support + ln -s ${libglvnd.out}/lib $out/lib + + mkdir -p $dev/{,lib/pkgconfig,nix-support} + echo "$out" > $dev/nix-support/propagated-build-inputs + ln -s ${mesa.dev}/include $dev/include + + genPkgConfig() { + local name="$1" + local lib="$2" + + cat <$dev/lib/pkgconfig/$name.pc + Name: $name + Description: $lib library + Version: ${mesa.version} + Libs: -L${libglvnd.out}/lib -l$lib + Cflags: -I${mesa.dev}/include + EOF + } + + genPkgConfig gl GL + genPkgConfig egl EGL + genPkgConfig glesv1_cm GLESv1_CM + genPkgConfig glesv2 GLESv2 + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57ab7b925b2d..d771dd0273b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12230,7 +12230,9 @@ in # libGL.so/libEGL.so/... to link agains them. Android NDK provides # an OpenGL implementation, we can just use that. libGL = if stdenv.hostPlatform.useAndroidPrebuilt then stdenv - else mesa.stubs; + else callPackage ../development/libraries/mesa/stubs.nix { + inherit (darwin.apple_sdk.frameworks) OpenGL; + }; # Default libGLU libGLU = mesa_glu; -- cgit 1.4.1 From 52829801b7e342521f471840169b4be50aed1471 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 25 Jun 2019 18:03:57 +0200 Subject: Revert "python: scikit-learn: 0.20.3 -> 0.21.2" This reverts commit 58cbb1b9e2c3c48304a9167c87d147992b36d8de. 78054a581c0f72aaa507eddc634ae7d733114b93 is more elaborated upgrade. --- pkgs/development/python-modules/scikitlearn/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index 399bf56af0ac..04ea254ee928 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -1,23 +1,22 @@ -{ stdenv, buildPythonPackage, fetchPypi, python -, gfortran, glibcLocales, joblib, pythonOlder -, numpy, scipy, pytest, pillow, cython +{ stdenv, buildPythonPackage, fetchPypi +, gfortran, glibcLocales +, numpy, scipy, pytest, pillow }: buildPythonPackage rec { pname = "scikit-learn"; - version = "0.21.2"; + version = "0.20.3"; # UnboundLocalError: local variable 'message' referenced before assignment - disabled = stdenv.isi686 || (pythonOlder "3.5"); # https://github.com/scikit-learn/scikit-learn/issues/5534 + disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; - sha256 = "0aafc312a55ebf58073151b9308761a5fcfa45b7f7730cea4b1f066f824c72db"; + sha256 = "c503802a81de18b8b4d40d069f5e363795ee44b1605f38bc104160ca3bfe2c41"; }; buildInputs = [ pillow gfortran glibcLocales ]; - propagatedBuildInputs = [ numpy scipy numpy.blas joblib ]; + propagatedBuildInputs = [ numpy scipy numpy.blas ]; checkInputs = [ pytest ]; - nativeBuildInputs = [ cython ]; LC_ALL="en_US.UTF-8"; -- cgit 1.4.1 From 85483ca76a045b309e514935c142fe97644fdf51 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 25 Jun 2019 18:22:48 +0200 Subject: wxGTK31: fix eval bc109b19c9a503948e0f88272224422c456ed5b9 on master created a separate expression based on wxGTK30, but that expression was modified on staging in f0733a07d5a1347eeee1fda81eee336fef50be66. Let's sync that. --- pkgs/development/libraries/wxwidgets/3.1/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index 60d026e9bebd..cee967ef2aa0 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig , gtk2, gtk3, libXinerama, libSM, libXxf86vm , xorgproto, gstreamer, gst-plugins-base, GConf, setfile -, libGLSupported +, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? libGLSupported, libGLU ? null, libGL ? null , compat28 ? false, compat30 ? true, unicode ? true , withGtk2 ? true -- cgit 1.4.1 From e529ec326338f660d14fa220b8440d5613d464a0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 19 Jun 2019 03:17:42 +0200 Subject: meson: enable auto_features by default We disabled them by default when they were introduced in https://github.com/NixOS/nixpkgs/pull/42994 but enabling them probably makes more sense: https://github.com/NixOS/nixpkgs/pull/54398 https://github.com/NixOS/nixpkgs/pull/63491 --- pkgs/development/tools/build-managers/meson/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index 06375c1528e0..7e2da2077e37 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -17,7 +17,7 @@ mesonConfigurePhase() { --includedir=${!outputInclude}/include \ --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \ --localedir=${!outputLib}/share/locale \ - -Dauto_features=disabled \ + -Dauto_features=${mesonAutoFeatures:-enabled} \ $mesonFlags" mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags" -- cgit 1.4.1 From 0fd5abb213bd334214ae8145e35e19c3a65d46c5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 19 Jun 2019 03:47:25 +0200 Subject: meson: do not download wraps --- pkgs/development/tools/build-managers/meson/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index 7e2da2077e37..ab4b27e3bf6f 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -18,6 +18,7 @@ mesonConfigurePhase() { --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \ --localedir=${!outputLib}/share/locale \ -Dauto_features=${mesonAutoFeatures:-enabled} \ + -Dwrap_mode=${mesonWrapMode:-nodownload} \ $mesonFlags" mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags" -- cgit 1.4.1 From 41c575b6fc52af1a3fb25f6d527c2b5e0dcc11b6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 19 Jun 2019 03:48:05 +0200 Subject: meson: use plain buildtype This should allow us to inherit optimization/striping from stdenv --- pkgs/development/tools/build-managers/meson/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index ab4b27e3bf6f..6e8d94523e14 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -21,7 +21,7 @@ mesonConfigurePhase() { -Dwrap_mode=${mesonWrapMode:-nodownload} \ $mesonFlags" - mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags" + mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-plain} $mesonFlags" echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}" -- cgit 1.4.1 From 76d85e4a6fdcacf9fd4b299b189cad84e9f6bdc0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 24 Jun 2019 16:44:08 +0200 Subject: gnome3.gnome-desktop: add libudev --- pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 2e6bb44b874f..4beeb190f025 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib , gettext, libxml2, xkeyboard_config, isocodes, meson, wayland -, libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: +, libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "gnome-desktop-${version}"; @@ -13,15 +13,13 @@ stdenv.mkDerivation rec { sha256 = "0bidx4626x7k2myv6f64qv4fzmxv8v475wibiz19kj8hjfr737q9"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig meson ninja gettext libxslt libxml2 gobject-introspection gtk-doc docbook_xsl ]; buildInputs = [ libX11 bubblewrap xkeyboard_config isocodes wayland - gtk3 glib libseccomp + gtk3 glib libseccomp systemd ]; propagatedBuildInputs = [ gsettings-desktop-schemas ]; -- cgit 1.4.1 From 4fa19ba151e475f289c00d2c2f034e4e512dc064 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 24 Jun 2019 16:45:30 +0200 Subject: gnome3.tracker-miners: do not add auto_features=enabled Meson setup hook now defaults to this. --- pkgs/desktops/gnome-3/core/tracker-miners/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index 66aeff1bf4de..eaa3ab3c089b 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -104,7 +104,6 @@ stdenv.mkDerivation rec { "-Dfunctional_tests=false" "-Ddbus_services=${placeholder "out"}/share/dbus-1/services" "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user" - "-Dauto_features=enabled" ]; patches = [ -- cgit 1.4.1 From 3238567677df5fc0faa3aa4353b260d157e16b19 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 24 Jun 2019 17:01:21 +0200 Subject: girara: fix build with auto_features=enabled Also split multiple outputs and enable tests. --- pkgs/applications/misc/girara/default.nix | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 919f20f13983..977bd17fb511 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,19 +1,34 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gtk, gettext, libiconv, libintl +{ stdenv, fetchurl, meson, ninja, pkgconfig, check, dbus, xvfb_run, glib, gtk, gettext, libiconv, json_c, libintl }: stdenv.mkDerivation rec { - name = "girara-${version}"; + pname = "girara"; version = "0.3.2"; + outputs = [ "out" "dev" ]; + src = fetchurl { - url = "https://pwmt.org/projects/girara/download/${name}.tar.xz"; + url = "https://pwmt.org/projects/girara/download/${pname}-${version}.tar.xz"; sha256 = "1kc6n1mxjxa7wvwnqy94qfg8l9jvx9qrvrr2kc7m4g0z20x3a00p"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext ]; - buildInputs = [ libintl libiconv ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext check dbus xvfb_run ]; + buildInputs = [ libintl libiconv json_c ]; propagatedBuildInputs = [ glib gtk ]; + doCheck = true; + + mesonFlags = [ + "-Ddocs=disabled" # docs do not seem to be installed + ]; + + checkPhase = '' + export NO_AT_BRIDGE=1 + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + meson test --print-errorlogs + ''; + meta = with stdenv.lib; { homepage = https://pwmt.org/projects/girara/; description = "User interface library"; -- cgit 1.4.1 From 592a52021d3650e931fe52d50e3a45d93b67b376 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 24 Jun 2019 17:03:56 +0200 Subject: grim: fix build with auto_features=enabled --- pkgs/tools/graphics/grim/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix index b84f498fa2f0..667a5b38d3ed 100644 --- a/pkgs/tools/graphics/grim/default.nix +++ b/pkgs/tools/graphics/grim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkgconfig, wayland-protocols }: +{ stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkgconfig, scdoc, wayland-protocols }: stdenv.mkDerivation rec { pname = "grim"; @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig + scdoc ]; buildInputs = [ -- cgit 1.4.1 From 5779747af450d801a2a838ef73c0c74d6759a3b6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 24 Jun 2019 17:06:05 +0200 Subject: wlroots: fix build with auto_features=enabled --- pkgs/development/libraries/wlroots/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 46b24467af9d..b85616842ea6 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg_4 +, libpng, ffmpeg_4, freerdp }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland libGL wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg_4 + libpng ffmpeg_4 freerdp ]; mesonFlags = [ -- cgit 1.4.1 From 4abfebf1feecab01e98706cac64d248995c03863 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 24 Jun 2019 17:08:41 +0200 Subject: ncmpc: fix build with auto_features=enabled --- pkgs/applications/audio/ncmpc/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 67fe983c26fd..a35d9c670fe8 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { buildInputs = [ glib ncurses mpd_clientlib boost ]; nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + mesonFlags = [ + "-Dlirc=disabled" + "-Dregex=disabled" + "-Ddocumentation=disabled" + ]; + meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; homepage = https://www.musicpd.org/clients/ncmpc/; -- cgit 1.4.1 From 4bc87ff3657e06f0b98cdedaf2237b5854304cce Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 25 Jun 2019 17:48:32 +0200 Subject: zathura: fix build with auto_features=enabled --- pkgs/applications/misc/zathura/core/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 3a53f7174ac8..835b408dca21 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig , appstream-glib, desktop-file-utils, python3 -, gtk, girara, gettext, libxml2 +, gtk, girara, gettext, libxml2, check , sqlite, glib, texlive, libintl, libseccomp , file, librsvg , gtk-mac-integration, synctexSupport ? true @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig desktop-file-utils python3.pkgs.sphinx - gettext wrapGAppsHook libxml2 + gettext wrapGAppsHook libxml2 check ] ++ optional stdenv.isLinux appstream-glib; buildInputs = [ @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { ++ optional stdenv.isLinux libseccomp ++ optional stdenv.isDarwin gtk-mac-integration; + doCheck = true; + meta = { homepage = https://pwmt.org/projects/zathura/; description = "A core component for zathura PDF viewer"; -- cgit 1.4.1 From c3fe79e9305f36affc68e5af737700e3d4542d10 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 25 Jun 2019 17:52:37 +0200 Subject: spice-gtk: remove auto_features=enabled from expression It is now default --- pkgs/development/libraries/spice-gtk/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index d597fd16ad07..079d61ca3d58 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -109,7 +109,6 @@ stdenv.mkDerivation rec { PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; mesonFlags = [ - "-Dauto_features=enabled" "-Dcelt051=disabled" "-Dpulse=disabled" # is deprecated upstream ]; -- cgit 1.4.1 From 1811e9155d97c77a1da08ab1fbe31bb835a03ab0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 25 Jun 2019 17:53:38 +0200 Subject: wl-clipboard: remove auto_features=enabled from expression It is now the default. --- pkgs/tools/misc/wl-clipboard/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/misc/wl-clipboard/default.nix b/pkgs/tools/misc/wl-clipboard/default.nix index 55a58185d562..00e26d762a44 100644 --- a/pkgs/tools/misc/wl-clipboard/default.nix +++ b/pkgs/tools/misc/wl-clipboard/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig wayland-protocols ]; buildInputs = [ wayland ]; - mesonFlags = [ "-Dauto_features=enabled" ]; meta = with stdenv.lib; { description = "Command-line copy/paste utilities for Wayland"; -- cgit 1.4.1 From c1d500ddd5cfa92c653ab9a05a7ca75f9e2325b6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 25 Jun 2019 17:54:19 +0200 Subject: spice: remove auto_features=enabled from expression It is now the default. --- pkgs/development/libraries/spice/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 9e50a3b86b94..d2c4ddb8631e 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -77,7 +77,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fno-stack-protector"; mesonFlags = [ - "-Dauto_features=enabled" "-Dgstreamer=1.0" "-Dcelt051=disabled" ]; -- cgit 1.4.1 From ac404cfa986af52ee831d697106428ddae596328 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 25 Jun 2019 17:54:53 +0200 Subject: gnome3.evince: remove auto_features=enabled from expression It is now the default. --- pkgs/desktops/gnome-3/core/evince/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 6e7f0716eefb..68beb0e47e35 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -104,7 +104,6 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]); mesonFlags = [ - "-Dauto_features=enabled" "-Dnautilus=false" "-Dps=enabled" "-Dgtk_doc=false" -- cgit 1.4.1 From dcac7eed6c123183613e5be042e050ee9575034c Mon Sep 17 00:00:00 2001 From: Vladyslav Burzakovskyy Date: Thu, 20 Jun 2019 16:28:48 +0200 Subject: maintainers: add mrmebelman --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c5ab50ba5e36..a2f8208b5d07 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3457,6 +3457,11 @@ github = "mrkkrp"; name = "Mark Karpov"; }; + mrmebelman = { + email = "burzakovskij@protonmail.com"; + github = "MrMebelMan"; + name = "Vladyslav Burzakovskyy"; + }; mrVanDalo = { email = "contact@ingolf-wagner.de"; github = "mrVanDalo"; -- cgit 1.4.1 From 28e804f9d6fa586f535c87990ce301e3abd36052 Mon Sep 17 00:00:00 2001 From: Vladyslav Burzakovskyy Date: Wed, 26 Jun 2019 14:34:34 +0200 Subject: supercollider: 3.9.3 -> 3.10.2 --- pkgs/development/interpreters/supercollider/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index c16b57dcb9c5..62118dd1c2ba 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, alsaLib , libjack2, libsndfile, fftw, curl, gcc -, libXt, qtbase, qttools, qtwebkit, readline -, useSCEL ? false, emacs +, libXt, qtbase, qttools, qtwebengine +, readline, qtwebsockets, useSCEL ? false, emacs }: let optional = stdenv.lib.optional; @@ -9,12 +9,12 @@ in stdenv.mkDerivation rec { name = "supercollider-${version}"; - version = "3.9.3"; + version = "3.10.2"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"; - sha256 = "1d8ixfl100jvlialxdizp8wqsl1mp5pi2bam25vp97bhjd59cfdr"; + sha256 = "0ynz1ydcpsd5h57h1n4a7avm6p1cif5a8rkmz4qpr46pr8z9p6iq"; }; hardeningDisable = [ "stackprotector" ]; @@ -27,13 +27,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig qttools ]; buildInputs = [ - gcc libjack2 libsndfile fftw curl libXt qtbase qtwebkit readline ] + gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] ++ optional (!stdenv.isDarwin) alsaLib ++ optional useSCEL emacs; - meta = { + meta = with stdenv.lib; { description = "Programming language for real time audio synthesis"; homepage = http://supercollider.sourceforge.net/; + maintainers = with maintainers; [ mrmebelman ]; license = stdenv.lib.licenses.gpl3Plus; platforms = [ "x686-linux" "x86_64-linux" ]; }; -- cgit 1.4.1 From 4c77d471e40ae1b1581cdbc33fb8fae00e6fd0b7 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sat, 16 Mar 2019 16:56:49 -0700 Subject: libdrm: build with meson --- pkgs/development/libraries/libdrm/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 7415aa754e7d..4ed3ad356a9f 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }: +{ stdenv, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess, valgrind-light }: stdenv.mkDerivation rec { name = "libdrm-2.4.98"; @@ -10,9 +10,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "bin" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig meson ninja ]; buildInputs = [ libpthreadstubs libpciaccess valgrind-light ]; - # libdrm as of 2.4.70 does not actually do anything with udev. postPatch = '' for a in */*-symbol-check ; do @@ -20,13 +19,15 @@ stdenv.mkDerivation rec { done ''; - configureFlags = [ "--enable-install-test-programs" ] + mesonFlags = + [ "-Dinstall-test-programs=true" ] ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) - [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ] - ++ stdenv.lib.optional stdenv.isDarwin "-C" - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-intel" + [ "-Dtegra=true" "-Detnaviv=true" ] + ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false" ; + enableParallelBuilding = true; + meta = { homepage = https://dri.freedesktop.org/libdrm/; description = "Library for accessing the kernel's Direct Rendering Manager"; -- cgit 1.4.1 From 544a87cf23b28ec9b85c90277784b919178ad388 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Tue, 26 Mar 2019 19:41:50 -0400 Subject: mesa: build with meson --- pkgs/development/libraries/mesa/default.nix | 183 +++++++++++---------- ...ache-include-dri-driver-path-in-cache-key.patch | 59 ++++--- .../libraries/mesa/opencl-install-dir.patch | 12 ++ .../libraries/mesa/symlink-drivers.patch | 112 ------------- 4 files changed, 147 insertions(+), 219 deletions(-) create mode 100644 pkgs/development/libraries/mesa/opencl-install-dir.patch delete mode 100644 pkgs/development/libraries/mesa/symlink-drivers.patch diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2c9a22f709ab..de73bf3b0456 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, lib -, pkgconfig, intltool, autoreconfHook -, file, expat, libdrm, xorg, wayland, wayland-protocols, openssl +{ stdenv, lib, fetchurl, fetchpatch +, pkgconfig, intltool, ninja, meson +, file, flex, bison, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal -, libelf, libvdpau, python2, python2Packages +, libelf, libvdpau, python3Packages , libglvnd , enableRadv ? true , galliumDrivers ? null @@ -32,17 +32,17 @@ let defaultGalliumDrivers = optionals (elem "drm" eglPlatforms) ([ "virgl" ] ++ lib.optionals pciePlatform [ "r300" "r600" "radeonsi" ] ++ lib.optionals (pciePlatform || stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "nouveau" ] - ++ lib.optionals stdenv.hostPlatform.isx86 [ "i915" "svga" ] + ++ lib.optionals stdenv.hostPlatform.isx86 [ "svga" ] ++ lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "vc4" ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "freedreno" "etnaviv" "imx" ] ); defaultDriDrivers = optionals (elem "drm" eglPlatforms) ([ ] - ++ lib.optionals pciePlatform [ "radeon" "r200" ] + ++ lib.optionals pciePlatform [ "r200" ] ++ lib.optionals (pciePlatform || stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "nouveau" ] ++ lib.optionals stdenv.hostPlatform.isx86 [ "i915" "i965" ]); defaultVulkanDrivers = optionals stdenv.hostPlatform.isLinux ([ ] ++ lib.optional stdenv.hostPlatform.isx86 "intel" - ++ lib.optional enableRadv "radeon"); + ++ lib.optional enableRadv "amd"); in let gallium_ = galliumDrivers; dri_ = driDrivers; vulkan_ = vulkanDrivers; in @@ -56,7 +56,7 @@ let driDrivers = (if dri_ == null then optionals (elem "drm" eglPlatforms) defaultDriDrivers - else dri_) ++ lib.optional stdenv.isLinux "swrast"; + else dri_); vulkanDrivers = if vulkan_ == null then defaultVulkanDrivers @@ -88,59 +88,75 @@ stdenv.mkDerivation rec { # revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved # ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog patches = [ - ./symlink-drivers.patch ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl + ./opencl-install-dir.patch ./disk_cache-include-dri-driver-path-in-cache-key.patch - ]; + ] # do not prefix user provided dri-drivers-path + ++ lib.optional (lib.versionOlder version "19.0.0") (fetchpatch { + url = "https://gitlab.freedesktop.org/mesa/mesa/commit/f6556ec7d126b31da37c08d7cb657250505e01a0.patch"; + sha256 = "0z6phi8hbrbb32kkp1js7ggzviq7faz1ria36wi4jbc4in2392d9"; + }) + ++ lib.optionals (lib.versionOlder version "19.1.0") [ + # do not prefix user provided d3d-drivers-path + (fetchpatch { + url = "https://gitlab.freedesktop.org/mesa/mesa/commit/dcc48664197c7e44684ccfb970a4ae083974d145.patch"; + sha256 = "1nhs0xpx3hiy8zfb5gx1zd7j7xha6h0hr7yingm93130a5902lkb"; + }) + + # don't build libGLES*.so with GLVND + (fetchpatch { + url = "https://gitlab.freedesktop.org/mesa/mesa/commit/b01524fff05eef66e8cd24f1c5aacefed4209f03.patch"; + sha256 = "1pszr6acx2xw469zq89n156p3bf3xf84qpbjw5fr1sj642lbyh7c"; + }) + ]; outputs = [ "out" "dev" "drivers" ] ++ lib.optional (elem "swrast" galliumDrivers) "osmesa"; # TODO: Figure out how to enable opencl without having a runtime dependency on clang - configureFlags = [ - "--sysconfdir=${libglvnd.driverLink}/etc" - "--localstatedir=/var" - "--with-dri-driverdir=$(drivers)/lib/dri" - "--with-dri-searchpath=${libglvnd.driverLink}/lib/dri" - "--with-platforms=${concatStringsSep "," eglPlatforms}" - "--with-gallium-drivers=${concatStringsSep "," galliumDrivers}" - "--with-dri-drivers=${concatStringsSep "," driDrivers}" - "--with-vulkan-drivers=${concatStringsSep "," vulkanDrivers}" - "--enable-texture-float" - (enableFeature stdenv.isLinux "dri3") - (enableFeature stdenv.isLinux "nine") # Direct3D in Wine - (enableFeature stdenv.isLinux "libglvnd") - "--enable-dri" - "--enable-driglx-direct" - "--enable-gles1" - "--enable-gles2" - "--enable-glx" - # https://bugs.freedesktop.org/show_bug.cgi?id=35268 - (enableFeature (!stdenv.hostPlatform.isMusl) "glx-tls") - # used by wine - (enableFeature (elem "swrast" galliumDrivers) "gallium-osmesa") - "--enable-llvm" - (enableFeature stdenv.isLinux "egl") - (enableFeature stdenv.isLinux "xa") # used in vmware driver - (enableFeature stdenv.isLinux "gbm") - "--enable-xvmc" - "--enable-vdpau" - "--enable-shared-glapi" - "--enable-llvm-shared-libs" - (enableFeature stdenv.isLinux "omx-bellagio") - (enableFeature stdenv.isLinux "va") - "--disable-opencl" - ]; - - nativeBuildInputs = [ - autoreconfHook intltool pkgconfig file - python2 python2Packages.Mako - ]; - - propagatedBuildInputs = with xorg; [ - libXdamage libXxf86vm - ] ++ optional stdenv.isLinux libdrm - ++ optionals stdenv.isDarwin [ OpenGL Xplugin ]; + mesonFlags = [ + "--sysconfdir=/etc" + + # Don't build in debug mode + # https://gitlab.freedesktop.org/mesa/mesa/blob/master/docs/meson.html#L327 + "-Db_ndebug=true" + + "-Ddisk-cache-key=${placeholder "drivers"}" + "-Ddri-search-path=${libglvnd.driverLink}/lib/dri" + + "-Dplatforms=${concatStringsSep "," eglPlatforms}" + "-Ddri-drivers=${concatStringsSep "," driDrivers}" + "-Dgallium-drivers=${concatStringsSep "," galliumDrivers}" + "-Dvulkan-drivers=${concatStringsSep "," vulkanDrivers}" + + "-Ddri-drivers-path=${placeholder "drivers"}/lib/dri" + "-Dvdpau-libs-path=${placeholder "drivers"}/lib/vdpau" + "-Dxvmc-libs-path=${placeholder "drivers"}/lib" + "-Domx-libs-path=${placeholder "drivers"}/lib/bellagio" + "-Dva-libs-path=${placeholder "drivers"}/lib/dri" + "-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d" + + "-Dgallium-vdpau=true" + "-Dgallium-xvmc=true" + "-Dgallium-opencl=disabled" + "-Dshared-glapi=true" + "-Dgles1=true" + "-Dgles2=true" + "-Dglx=dri" + "-Dglvnd=true" + "-Dllvm=true" + "-Dshared-llvm=true" + "-Dglx-direct=true" + ] ++ optional (elem "swrast" galliumDrivers) "-Dosmesa=gallium" # used by wine + ++ optionals (stdenv.isLinux) [ + "-Ddri3=true" + "-Dgallium-omx=bellagio" + "-Dgallium-va=true" + "-Dgallium-xa=true" # used in vmware driver + "-Dgallium-nine=true" # Direct3D in Wine + "-Dgbm=true" + "-Degl=true" + ]; buildInputs = with xorg; [ expat llvmPackages.llvm libglvnd xorgproto @@ -151,50 +167,38 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] ++ lib.optional withValgrind valgrind-light; + nativeBuildInputs = [ + pkgconfig meson ninja + intltool bison flex file + python3Packages.python python3Packages.Mako + ]; + + propagatedBuildInputs = with xorg; [ + libXdamage libXxf86vm + ] ++ optional stdenv.isLinux libdrm + ++ optionals stdenv.isDarwin [ OpenGL Xplugin ]; + enableParallelBuilding = true; doCheck = false; - installFlags = [ - "sysconfdir=\${drivers}/etc" - "localstatedir=\${TMPDIR}" - "vendorjsondir=\${out}/share/glvnd/egl_vendor.d" - ]; - - # TODO: probably not all .la files are completely fixed, but it shouldn't matter; postInstall = '' # Some installs don't have any drivers so this directory is never created. mkdir -p $drivers '' + optionalString (galliumDrivers != []) '' + mkdir -p $drivers/lib + # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM - mv -t "$drivers/lib/" \ - $out/lib/libXvMC* \ - $out/lib/d3d \ - $out/lib/vdpau \ - $out/lib/bellagio \ + mv -t $drivers/lib \ $out/lib/libxatracker* \ $out/lib/libvulkan_* # Move other drivers to a separate output - mv $out/lib/dri/* $drivers/lib/dri # */ - rmdir "$out/lib/dri" mv $out/lib/lib*_mesa* $drivers/lib # move libOSMesa to $osmesa, as it's relatively big - mkdir -p {$osmesa,$drivers}/lib/ + mkdir -p $osmesa/lib mv -t $osmesa/lib/ $out/lib/libOSMesa* - # now fix references in .la files - sed "/^libdir=/s,$out,$osmesa," -i $osmesa/lib/libOSMesa*.la - - # set the default search path for DRI drivers; used e.g. by X server - substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${libglvnd.driverLink}" - - # remove GLES libraries; they are provided by libglvnd - rm $out/lib/lib{GLESv1_CM,GLESv2}.* - - # remove pkgconfig files for GL/GLES/EGL; they are provided by libGL. - rm $dev/lib/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc - # move vendor files mv $out/share/ $drivers/ @@ -202,11 +206,6 @@ stdenv.mkDerivation rec { for js in $drivers/share/glvnd/egl_vendor.d/*.json; do substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_" done - - # Update search path used by pkg-config - for pc in $dev/lib/pkgconfig/{d3d,dri,xatracker}.pc; do - substituteInPlace "$pc" --replace $out $drivers - done '' + optionalString (vulkanDrivers != []) '' # Update search path used by Vulkan (it's pointing to $out but # drivers are in $drivers) @@ -219,6 +218,17 @@ stdenv.mkDerivation rec { # check $out doesn't depend on llvm: builder failures are ignored # for some reason grep -qv '${llvmPackages.llvm}' -R "$out"; postFixup = optionalString (galliumDrivers != []) '' + # set the default search path for DRI drivers; used e.g. by X server + substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace "$drivers" "${libglvnd.driverLink}" + + # remove pkgconfig files for GL/EGL; they are provided by libGL. + rm $dev/lib/pkgconfig/{gl,egl}.pc + + # Update search path used by pkg-config + for pc in $dev/lib/pkgconfig/{d3d,dri,xatracker}.pc; do + substituteInPlace "$pc" --replace $out $drivers + done + # add RPATH so the drivers can find the moved libgallium and libdricore9 # moved here to avoid problems with stripping patchelfed files for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do @@ -241,4 +251,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ vcunat ]; }; } - diff --git a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch index 37813db89347..1e280b64ee5f 100644 --- a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch +++ b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch @@ -6,29 +6,30 @@ Subject: [PATCH] disk_cache: include dri driver path in cache key This fixes invalid cache hits on NixOS where all shared library timestamps in /nix/store are zero. --- - src/util/Makefile.am | 3 +++ + meson_options.txt | 6 ++++++ src/util/disk_cache.c | 3 +++ - 2 files changed, 6 insertions(+) + src/util/meson.build | 7 ++++++- + 3 files changed, 15 insertions(+), 1 deletion(-) -diff --git a/src/util/Makefile.am b/src/util/Makefile.am -index bafb57439a..a22e2e41eb 100644 ---- a/src/util/Makefile.am -+++ b/src/util/Makefile.am -@@ -35,6 +35,9 @@ noinst_LTLIBRARIES = \ - libmesautil.la \ - libxmlconfig.la - -+AM_CFLAGS = \ -+ -DDISK_CACHE_KEY=\"$(drivers)\" -+ - AM_CPPFLAGS = \ - $(PTHREAD_CFLAGS) \ - -I$(top_srcdir)/include +diff --git a/meson_options.txt b/meson_options.txt +index a723b5406cf..65a8954291f 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -330,3 +330,9 @@ option( + value : true, + description : 'Enable direct rendering in GLX and EGL for DRI', + ) ++option( ++ 'disk-cache-key', ++ type : 'string', ++ value : '', ++ description : 'Mesa cache key.' ++) diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c -index 368ec41792..071220b2ba 100644 +index 0aa2646a9bb..bd784d38e21 100644 --- a/src/util/disk_cache.c +++ b/src/util/disk_cache.c -@@ -388,8 +388,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -389,8 +389,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, /* Create driver id keys */ size_t id_size = strlen(driver_id) + 1; @@ -39,7 +40,7 @@ index 368ec41792..071220b2ba 100644 cache->driver_keys_blob_size += gpu_name_size; /* We sometimes store entire structs that contains a pointers in the cache, -@@ -410,6 +412,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -411,6 +413,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, uint8_t *drv_key_blob = cache->driver_keys_blob; DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size) DRV_KEY_CPY(drv_key_blob, driver_id, id_size) @@ -47,6 +48,24 @@ index 368ec41792..071220b2ba 100644 DRV_KEY_CPY(drv_key_blob, gpu_name, gpu_name_size) DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size) DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size) +diff --git a/src/util/meson.build b/src/util/meson.build +index 397c2228129..77013563e5d 100644 +--- a/src/util/meson.build ++++ b/src/util/meson.build +@@ -120,7 +120,12 @@ libmesa_util = static_library( + [files_mesa_util, format_srgb], + include_directories : inc_common, + dependencies : [dep_zlib, dep_clock, dep_thread, dep_atomic, dep_m], +- c_args : [c_msvc_compat_args, c_vis_args], ++ c_args : [ ++ c_msvc_compat_args, c_vis_args, ++ '-DDISK_CACHE_KEY="@0@"'.format( ++ get_option('disk-cache-key') ++ ), ++ ], + build_by_default : false + ) + -- -2.19.1 +2.19.2 diff --git a/pkgs/development/libraries/mesa/opencl-install-dir.patch b/pkgs/development/libraries/mesa/opencl-install-dir.patch new file mode 100644 index 000000000000..fe85d2c90bb2 --- /dev/null +++ b/pkgs/development/libraries/mesa/opencl-install-dir.patch @@ -0,0 +1,12 @@ +diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build +index 317ad8dab4a..5567308caf0 100644 +--- a/src/gallium/targets/opencl/meson.build ++++ b/src/gallium/targets/opencl/meson.build +@@ -68,6 +68,6 @@ if with_opencl_icd + input : 'mesa.icd.in', + output : 'mesa.icd', + install : true, +- install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), ++ install_dir : join_paths(get_option('prefix'), 'etc', 'OpenCL', 'vendors'), + ) + endif diff --git a/pkgs/development/libraries/mesa/symlink-drivers.patch b/pkgs/development/libraries/mesa/symlink-drivers.patch deleted file mode 100644 index af2ec9fdb096..000000000000 --- a/pkgs/development/libraries/mesa/symlink-drivers.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/dri/Makefile.am mesa-12.0.3/src/gallium/targets/dri/Makefile.am ---- mesa-12.0.3-orig/src/gallium/targets/dri/Makefile.am 2016-09-08 18:57:48.000000000 +0200 -+++ mesa-12.0.3/src/gallium/targets/dri/Makefile.am 2016-09-22 14:42:19.173575498 +0200 -@@ -134,14 +134,13 @@ - done; - endif - --# hardlink each megadriver instance, but don't actually have --# gallium_dri.so in the set of final installed files. -+# symlink each megadriver instance. - install-data-hook: - for i in $(TARGET_DRIVERS); do \ -- ln -f $(DESTDIR)$(dridir)/gallium_dri.so \ -+ ln -srf $(DESTDIR)$(dridir)/gallium_dri.so \ - $(DESTDIR)$(dridir)/$${i}_dri.so; \ - done; \ -- $(RM) $(DESTDIR)$(dridir)/gallium_dri.*; \ -+ $(RM) $(DESTDIR)$(dridir)/gallium_dri.la \ - $(RM) -d $(DESTDIR)$(dridir) &>/dev/null || true - - uninstall-hook: - for i in $(TARGET_DRIVERS); do \ -diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/va/Makefile.am mesa-12.0.3/src/gallium/targets/va/Makefile.am ---- mesa-12.0.3-orig/src/gallium/targets/va/Makefile.am 2016-09-08 18:57:48.000000000 +0200 -+++ mesa-12.0.3/src/gallium/targets/va/Makefile.am 2016-09-22 14:45:39.635963339 +0200 -@@ -71,10 +71,10 @@ - # gallium_drv_video.so in the set of final installed files. - install-data-hook: - for i in $(TARGET_DRIVERS); do \ -- ln -f $(DESTDIR)$(vadir)/gallium_drv_video.so \ -+ ln -srf $(DESTDIR)$(vadir)/gallium_drv_video.so \ - $(DESTDIR)$(vadir)/$${i}_drv_video.so; \ - done; \ -- $(RM) $(DESTDIR)$(vadir)/gallium_drv_video.* -+ $(RM) $(DESTDIR)$(vadir)/gallium_drv_video.la - - uninstall-hook: - for i in $(TARGET_DRIVERS); do \ -diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/vdpau/Makefile.am mesa-12.0.3/src/gallium/targets/vdpau/Makefile.am ---- mesa-12.0.3-orig/src/gallium/targets/vdpau/Makefile.am 2016-05-24 21:19:37.000000000 +0200 -+++ mesa-12.0.3/src/gallium/targets/vdpau/Makefile.am 2016-09-22 14:42:19.173575498 +0200 -@@ -103,15 +103,14 @@ - done; - endif - --# hardlink each megadriver instance, but don't actually have --# libvdpau_gallium.so in the set of final installed files. -+# symlink each megadriver instance. - install-data-hook: - $(AM_V_GEN)dest_dir=$(DESTDIR)/$(vdpaudir); \ - for i in $(TARGET_DRIVERS); do \ - j=libvdpau_gallium.$(LIB_EXT); \ - k=libvdpau_$${i}.$(LIB_EXT); \ - l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \ -- ln -f $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \ -+ ln -srf $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \ - $${dest_dir}/$${l}; \ - ln -sf $${l} \ - $${dest_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \ -@@ -120,7 +119,7 @@ - ln -sf $${l} \ - $${dest_dir}/$${k}; \ - done; \ -- $(RM) $${dest_dir}/libvdpau_gallium.*; \ -+ $(RM) $${dest_dir}/libvdpau_gallium.la \ - $(RM) -d $${dest_dir} &>/dev/null || true - - uninstall-hook: - for i in $(TARGET_DRIVERS); do \ -diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/xvmc/Makefile.am mesa-12.0.3/src/gallium/targets/xvmc/Makefile.am ---- mesa-12.0.3-orig/src/gallium/targets/xvmc/Makefile.am 2016-05-24 21:19:37.000000000 +0200 -+++ mesa-12.0.3/src/gallium/targets/xvmc/Makefile.am 2016-09-22 14:54:22.291014543 +0200 -@@ -73,7 +73,7 @@ - j=libXvMCgallium.$(LIB_EXT); \ - k=libXvMC$${i}.$(LIB_EXT); \ - l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0; \ -- ln -f $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \ -+ ln -srf $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \ - $${dest_dir}/$${l}; \ - ln -sf $${l} \ - $${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR); \ -@@ -82,7 +82,7 @@ - ln -sf $${l} \ - $${dest_dir}/$${k}; \ - done; \ -- $(RM) $${dest_dir}/libXvMCgallium.*; \ -+ $(RM) $${dest_dir}/libXvMCgallium.la \ - $(RM) -d $${dest_dir} &>/dev/null || true - - uninstall-hook: - for i in $(TARGET_DRIVERS); do \ -diff -ru -x '*~' mesa-12.0.3-orig/src/mesa/drivers/dri/Makefile.am mesa-12.0.3/src/mesa/drivers/dri/Makefile.am ---- mesa-12.0.3-orig/src/mesa/drivers/dri/Makefile.am 2016-09-08 18:57:48.000000000 +0200 -+++ mesa-12.0.3/src/mesa/drivers/dri/Makefile.am 2016-09-22 14:42:19.173575498 +0200 -@@ -94,14 +94,13 @@ - done; - endif - --# hardlink each megadriver instance, but don't actually have --# mesa_dri_drivers.so in the set of final installed files. -+# symink each megadriver instance. - install-data-hook: - for i in $(MEGADRIVERS); do \ -- ln -f $(DESTDIR)$(dridir)/mesa_dri_drivers.so \ -+ ln -srf $(DESTDIR)$(dridir)/mesa_dri_drivers.so \ - $(DESTDIR)$(dridir)/$$i; \ - done; -- $(RM) $(DESTDIR)$(dridir)/mesa_dri_drivers.* -+ $(RM) $(DESTDIR)$(dridir)/mesa_dri_drivers.la - - uninstall-hook: - for i in $(MEGADRIVERS); do \ -- cgit 1.4.1 From 1141c6f5f854c9cc65d3f96b8b2d1c3bf713d5e3 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Tue, 11 Jun 2019 16:23:45 -0400 Subject: mesa: 18.3.4 -> 19.1.1 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index de73bf3b0456..345bbaf251dc 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -64,7 +64,7 @@ let in let - version = "18.3.4"; + version = "19.1.1"; branch = head (splitString "." version); in @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "01xv03ah4l5lcfx015n3fg1620dh4nbbv6gmhh6zhdsx6sj4sc9j"; + sha256 = "10amy5sdmpjbskr3xazgk0jyli8xpgi0y1nsmjr76hx8nhb4n4bj"; }; prePatch = "patchShebangs ."; -- cgit 1.4.1 From 58a85eb83a60189f9b120cf4496531627c107b49 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 27 Jun 2019 10:28:03 -0400 Subject: supercollider: change license gpl3Plus -> gpl3 --- pkgs/development/interpreters/supercollider/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 62118dd1c2ba..057375182f53 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "Programming language for real time audio synthesis"; homepage = http://supercollider.sourceforge.net/; maintainers = with maintainers; [ mrmebelman ]; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3; platforms = [ "x686-linux" "x86_64-linux" ]; }; } -- cgit 1.4.1 From 67bca98ff7daf9cbb3d6e76996ec6f24cacd8806 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 27 Jun 2019 16:30:28 -0400 Subject: gnome3.gnome-photos: don't set buildtype Plain is now default. --- pkgs/desktops/gnome-3/apps/gnome-photos/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 0a33a3bff559..9d08cc24aadb 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -34,10 +34,6 @@ in stdenv.mkDerivation rec { dbus ]; - mesonFlags = [ - "--buildtype=plain" # don't do any git commands - ]; - postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py -- cgit 1.4.1 From f2125d701bb3ff1f1f8d71397832e6a688549791 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 27 Jun 2019 16:32:07 -0400 Subject: gnome3.gedit: don't set buildtype Plain is now default. --- pkgs/desktops/gnome-3/apps/gedit/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 532e8dcb0f08..2dcd265e2e48 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -32,10 +32,6 @@ stdenv.mkDerivation rec { patchShebangs plugins/externaltools/scripts/gedit-tool-merge.pl ''; - mesonFlags = [ - "--buildtype=plain" # don't require git - ]; - # Reliably fails to generate gedit-file-browser-enum-types.h in time enableParallelBuilding = false; -- cgit 1.4.1 From 16bade005dd43f810de130dd223f7e1c99749210 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 27 Jun 2019 16:32:22 -0400 Subject: gnome3.gnome-books: don't set buildtype Plain is now default. --- pkgs/desktops/gnome-3/apps/gnome-books/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix index b9fb2dc05a06..6edf86ec552b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix @@ -14,10 +14,6 @@ stdenv.mkDerivation rec { sha256 = "1wkcywcwwszj9mldr0lngczqdz7hys08rr1nd2k6rs8ykzs2z7m4"; }; - mesonFlags = [ - "--buildtype=plain" - ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt desktop-file-utils docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3 -- cgit 1.4.1 From 5c3d3429f4f5816193438b317851222b461292cd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 27 Jun 2019 16:32:47 -0400 Subject: gnome3.gnome-documents: don't set buildtype Plain is now default. --- pkgs/desktops/gnome-3/apps/gnome-documents/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 6f171d744a55..e0f28bc3446d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgetting-started=true" - "--buildtype=plain" ]; nativeBuildInputs = [ -- cgit 1.4.1 From 7d703ff5a569e43d342a55aa3cf9ab984cbb56ff Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 27 Jun 2019 17:07:48 -0400 Subject: mesa: fix build Aarch64 --- pkgs/development/libraries/mesa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 345bbaf251dc..1f1962d64023 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -34,7 +34,7 @@ let ++ lib.optionals (pciePlatform || stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "nouveau" ] ++ lib.optionals stdenv.hostPlatform.isx86 [ "svga" ] ++ lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "vc4" ] - ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "freedreno" "etnaviv" "imx" ] + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "freedreno" "etnaviv" ] ); defaultDriDrivers = optionals (elem "drm" eglPlatforms) ([ ] ++ lib.optionals pciePlatform [ "r200" ] -- cgit 1.4.1 From 02e8a36df1c33253822a945ab6290960edf7d082 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 29 Jun 2019 12:14:42 +0200 Subject: zsh-you-should-use: init at 1.1.0 Simple zsh plugin that reminds you to use existing aliases. With `oh-my-zsh` it can be installed like this: ``` { programs.zsh.ohMyZsh = { customPkgs = [ pkgs.zsh-you-should-use ]; plugins = [ "you-should-use" ]; }; } ``` --- pkgs/shells/zsh/zsh-you-should-use/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/shells/zsh/zsh-you-should-use/default.nix diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/pkgs/shells/zsh/zsh-you-should-use/default.nix new file mode 100644 index 000000000000..c44483d3744f --- /dev/null +++ b/pkgs/shells/zsh/zsh-you-should-use/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "zsh-you-should-use"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "MichaelAquilina"; + repo = pname; + rev = version; + sha256 = "0fig5ralagi5jajk7gdm52jvwql17qk9cd6j98qsndvckb26a753"; + }; + + dontBuild = true; + + installPhase = '' + install -D you-should-use.plugin.zsh $out/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/MichaelAquilina/zsh-you-should-use; + license = licenses.gpl3; + description = "ZSH plugin that reminds you to use existing aliases for commands you just typed"; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54f2cab11d48..379a30e66ea4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6987,6 +6987,8 @@ in zsh-command-time = callPackage ../shells/zsh/zsh-command-time { }; + zsh-you-should-use = callPackage ../shells/zsh/zsh-you-should-use { }; + zssh = callPackage ../tools/networking/zssh { }; zstd = callPackage ../tools/compression/zstd { }; -- cgit 1.4.1 From df489f82e1b4d14a65d01a0036fa547fbb859f83 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 25 Jun 2019 23:00:15 +0200 Subject: systemd: apply systemd-stable 242 backports from https://github.com/NixOS/systemd/pull/29 --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 1485d060281f..39aa855e3cc5 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "nixos-v${version}"; - sha256 = "0ldyhfxdy4qlgygvpc92wp0qp6p1c9y3rnm77zwbkga48x60d9i8"; + rev = "aa4c4d39d75ce52664cb28d569b1ceafda7b4c06"; + sha256 = "1ax94gzbdwdcf3wgj7f9cabdkvn2zynnnli7gkbz4isidlpis86g"; }; outputs = [ "out" "lib" "man" "dev" ]; -- cgit 1.4.1 From f88bb6c2b2bec0ca3d6ad9da5d1348fd779c22e5 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sun, 30 Jun 2019 12:05:55 +0200 Subject: mautrix-appservice: 0.3.10.dev1 -> 0.3.11 --- pkgs/development/python-modules/mautrix-appservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mautrix-appservice/default.nix b/pkgs/development/python-modules/mautrix-appservice/default.nix index 8f59d7ce7b5e..ba96e7d734be 100644 --- a/pkgs/development/python-modules/mautrix-appservice/default.nix +++ b/pkgs/development/python-modules/mautrix-appservice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "mautrix-appservice"; - version = "0.3.10.dev1"; + version = "0.3.11"; src = fetchPypi { inherit pname version; - sha256 = "ed827ff2a50b43f8125268145991d51b4a32ea4fbdd95b589ea15019b72a0bc3"; + sha256 = "60192920cff75afdd096eea3a43276e33ec15f4f00bd04d2d1dda616c84f22a5"; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 91e311d1b060cf0891f82e16dd89d830c3600df2 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sun, 30 Jun 2019 12:06:17 +0200 Subject: telethon: 1.6.2 -> 1.8.0 --- pkgs/development/python-modules/telethon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index 09d944c80883..ec1c01df7c77 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "telethon"; - version = "1.6.2"; + version = "1.8.0"; src = fetchPypi { inherit version; pname = "Telethon"; - sha256 = "074h5gj0c330rb1nxzpqm31fp1vw7calh1cdkapbjx90j769iz18"; + sha256 = "6e8f55cbe26a031d427f2c3e23d391b8c2272d1540bcb36fe4df65d928ca2b25"; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 0197c05786be1ce37c694abb3f9f150bfbf818a5 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 19 Jun 2019 09:00:14 -0400 Subject: setup.sh: add dontConfigure There's already 21 occurences of this and I've expected this to exist without knowing it had no affect for a while. --- pkgs/stdenv/generic/setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index dcccdaa50ae5..38453aa61bb0 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1283,6 +1283,7 @@ genericBuild() { fi for curPhase in $phases; do + if [[ "$curPhase" = configurePhase && -n "${dontConfigure:-}" ]]; then continue; fi if [[ "$curPhase" = buildPhase && -n "${dontBuild:-}" ]]; then continue; fi if [[ "$curPhase" = checkPhase && -z "${doCheck:-}" ]]; then continue; fi if [[ "$curPhase" = installPhase && -n "${dontInstall:-}" ]]; then continue; fi -- cgit 1.4.1 From c79ec3323e9eee544217742df1e032bb5b601296 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 19 Jun 2019 09:00:39 -0400 Subject: doc/stdenv: describe dontConfigure --- doc/stdenv.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index dbffdad9fdee..9de912274dc7 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1109,6 +1109,16 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] + + + dontConfigure + + + + Set to true to skip the configure phase. + + + configureFlagsArray -- cgit 1.4.1 From cab7c6cbd964a99db55ba55960c8ddbaf294bc67 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 19 Jun 2019 11:36:06 -0400 Subject: treewide: use dontConfigure --- .../services/hardware/sane_extra_backends/brscan4_etc_files.nix | 4 ++-- nixos/modules/services/web-servers/lighttpd/collectd.nix | 2 +- pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix | 2 +- pkgs/applications/editors/emacs-modes/quack/default.nix | 2 +- pkgs/applications/misc/batti/default.nix | 4 ++-- pkgs/applications/misc/cdrtools/default.nix | 2 +- pkgs/applications/networking/cluster/hadoop/default.nix | 4 ++-- pkgs/applications/networking/sync/rsync/rrsync.nix | 2 +- pkgs/applications/video/dvb-apps/default.nix | 2 +- pkgs/development/libraries/zlib/default.nix | 2 +- pkgs/development/ocaml-modules/cryptgps/default.nix | 2 +- pkgs/development/ocaml-modules/expat/0.9.nix | 2 +- pkgs/development/ocaml-modules/extlib/default.nix | 2 +- pkgs/development/ocaml-modules/http/default.nix | 2 +- pkgs/development/ocaml-modules/pcre/default.nix | 2 +- pkgs/development/tools/java/jhiccup/default.nix | 2 +- pkgs/development/tools/misc/ycmd/default.nix | 2 +- pkgs/misc/apulse/pressureaudio.nix | 8 ++++---- pkgs/os-specific/linux/trace-cmd/default.nix | 2 +- pkgs/servers/foundationdb/vsmake.nix | 2 +- pkgs/tools/archivers/unp/default.nix | 2 +- pkgs/tools/graphics/glxinfo/default.nix | 2 +- pkgs/tools/graphics/rocket/default.nix | 2 +- pkgs/tools/misc/hdfjava/default.nix | 2 +- pkgs/tools/networking/wrk2/default.nix | 2 +- pkgs/top-level/emacs-packages.nix | 2 +- 26 files changed, 32 insertions(+), 32 deletions(-) diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix index bd114f0d2cca..fd19d8020fb8 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix @@ -19,7 +19,7 @@ nix-shell -E 'with import { }; brscan4-etc-files.override{netDevices=[ */ -with lib; +with lib; let @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ brscan4 ]; - configurePhase = ":"; + dontConfigure = true; buildPhase = '' TARGET_DIR="$out/etc/opt/brother/scanner/brscan4" diff --git a/nixos/modules/services/web-servers/lighttpd/collectd.nix b/nixos/modules/services/web-servers/lighttpd/collectd.nix index e70c980d5243..3f262451c2cb 100644 --- a/nixos/modules/services/web-servers/lighttpd/collectd.nix +++ b/nixos/modules/services/web-servers/lighttpd/collectd.nix @@ -12,7 +12,7 @@ let defaultCollectionCgi = config.services.collectd.package.overrideDerivation(old: { name = "collection.cgi"; - configurePhase = "true"; + dontConfigure = true; buildPhase = "true"; installPhase = '' substituteInPlace contrib/collection.cgi --replace '"/etc/collection.conf"' '$ENV{COLLECTION_CONF}' diff --git a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix index 8980dc1f0a9a..8b3a0476e48c 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix @@ -5,7 +5,7 @@ let name = emacs.name + "-sources"; src = emacs.src; - configurePhase = ":"; + dontConfigure = true; dontBuild = true; doCheck = false; fixupPhase = ":"; diff --git a/pkgs/applications/editors/emacs-modes/quack/default.nix b/pkgs/applications/editors/emacs-modes/quack/default.nix index 95634a24ded4..29b3a72e9f0d 100644 --- a/pkgs/applications/editors/emacs-modes/quack/default.nix +++ b/pkgs/applications/editors/emacs-modes/quack/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ emacs ]; unpackPhase = "true"; - configurePhase = "true"; + dontConfigure = true; installPhase = "true"; buildPhase = '' diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix index 283e7f199071..9322aefb2d69 100644 --- a/pkgs/applications/misc/batti/default.nix +++ b/pkgs/applications/misc/batti/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ pkgconfig gettext python gtk2 pygtk dbus-python gdk_pixbuf upower makeWrapper ]; - configurePhase = "true"; + dontConfigure = true; buildPhase = '' python setup.py build @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; - broken = true; # see https://github.com/NixOS/nixpkgs/pull/4031#issuecomment-56283520 + broken = true; # see https://github.com/NixOS/nixpkgs/pull/4031#issuecomment-56283520 }; } diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix index a46565eb76ba..3738fb83c705 100644 --- a/pkgs/applications/misc/cdrtools/default.nix +++ b/pkgs/applications/misc/cdrtools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { substituteInPlace man/Makefile --replace "man4" "" ''; - configurePhase = "true"; + dontConfigure = true; GMAKE_NOWARN = true; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index dfe6513bf0c1..42c043d0007f 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -19,7 +19,7 @@ let # perform fake build to make a fixed-output derivation of dependencies downloaded from maven central (~100Mb in ~3000 files) fetched-maven-deps = stdenv.mkDerivation { name = "hadoop-${version}-maven-deps"; - inherit src postUnpack nativeBuildInputs buildInputs configurePhase; + inherit src postUnpack nativeBuildInputs buildInputs; buildPhase = '' while mvn package -Dmaven.repo.local=$out/.m2 ${mavenFlags} -Dmaven.wagon.rto=5000; [ $? = 1 ]; do echo "timeout, restart maven to continue downloading" @@ -51,7 +51,7 @@ let fi done ''; - configurePhase = "true"; # do not trigger cmake hook + dontConfigure = true; # do not trigger cmake hook mavenFlags = "-Drequire.snappy -Drequire.bzip2 -DskipTests -Pdist,native -e"; buildPhase = '' # 'maven.repo.local' must be writable diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index 7563b0ea1950..12f992d44a5a 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # Skip configure and build phases. # We just want something from the support directory - configurePhase = "true"; + dontConfigure = true; dontBuild = true; postPatch = '' diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix index 6281c7884015..a032ef654aa3 100644 --- a/pkgs/applications/video/dvb-apps/default.nix +++ b/pkgs/applications/video/dvb-apps/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ perl ]; - configurePhase = "true"; # skip configure + dontConfigure = true; # skip configure installPhase = "make prefix=$out install"; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 3a5638b22814..7fb5be1c3434 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -86,5 +86,5 @@ stdenv.mkDerivation (rec { export CHOST=${stdenv.hostPlatform.config} ''; } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.libc == "msvcrt") { - configurePhase = ":"; + dontConfigure = true; }) diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index f8eb80837a3e..7720650ddfc9 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ocaml findlib]; - configurePhase = "true"; # Skip configure phase + dontConfigure = true; # Skip configure phase createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/expat/0.9.nix b/pkgs/development/ocaml-modules/expat/0.9.nix index 5fcc317d9408..98ab04beb57c 100644 --- a/pkgs/development/ocaml-modules/expat/0.9.nix +++ b/pkgs/development/ocaml-modules/expat/0.9.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { --replace "gcc" "\$(CC)" ''; - configurePhase = "true"; # Skip configure + dontConfigure = true; # Skip configure buildPhase = '' make all allopt diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index dba3e2569574..df0bd9133d3c 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; - configurePhase = "true"; # Skip configure + dontConfigure = true; # Skip configure # De facto, option minimal=1 seems to be the default. See the README. buildPhase = "make ${if minimal then "minimal=1" else ""} build"; installPhase = "make ${if minimal then "minimal=1" else ""} install"; diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index b9b530ac599e..4a8b39063361 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH" ''; - configurePhase = "true"; # Skip configure phase + dontConfigure = true; # Skip configure phase buildPhase = '' make all opt diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index fb3b67b03b78..6428670ebb2f 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - configurePhase = "true"; # Skip configure phase + dontConfigure = true; # Skip configure phase meta = with stdenv.lib; { homepage = https://bitbucket.org/mmottl/pcre-ocaml; diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix index 6fb34588cd0b..4577de0cde4c 100644 --- a/pkgs/development/tools/java/jhiccup/default.nix +++ b/pkgs/development/tools/java/jhiccup/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1hsvi8wjh615fnjf75h7b5afp04chqcgvini30vfcn3m9a5icbgy"; }; - configurePhase = ":"; + dontConfigure = true; buildPhase = ":"; installPhase = '' mkdir -p $out/bin $out/share/java diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 062f90e3389d..2e67da18ae9a 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ${python.interpreter} build.py --system-libclang --clang-completer --system-boost ''; - configurePhase = ":"; + dontConfigure = true; # remove the tests # diff --git a/pkgs/misc/apulse/pressureaudio.nix b/pkgs/misc/apulse/pressureaudio.nix index 142b72784578..710712fe5084 100644 --- a/pkgs/misc/apulse/pressureaudio.nix +++ b/pkgs/misc/apulse/pressureaudio.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; - configurePhase = ":"; + dontConfigure = true; buildPhase = ":"; @@ -36,7 +36,7 @@ stdenv.mkDerivation { Name: libpulse Description: PulseAudio Client Interface Version: ${libpulseaudio.version}-rebootstrapped - Libs: -L$out/lib -lpulse + Libs: -L$out/lib -lpulse Cflags: -I$out/include -D_REENTRANT EOF @@ -44,7 +44,7 @@ stdenv.mkDerivation { Name: libpulse-simple Description: PulseAudio Simplified Synchronous Client Interface Version: ${libpulseaudio.version}-rebootstrapped - Libs: -L$out/lib -lpulse-simple + Libs: -L$out/lib -lpulse-simple Cflags: -I$out/include -D_REENTRANT Requires: libpulse EOF @@ -53,7 +53,7 @@ stdenv.mkDerivation { Name: libpulse-mainloop-glib Description: PulseAudio GLib 2.0 Main Loop Wrapper Version: ${libpulseaudio.version}-rebootstrapped - Libs: -L$out/lib -lpulse-mainloop-glib + Libs: -L$out/lib -lpulse-mainloop-glib Cflags: -I$out/include -D_REENTRANT Requires: libpulse glib-2.0 EOF diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 1d1712f6b476..33dbfe5bf0a7 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ asciidoc libxslt ]; - configurePhase = "true"; + dontConfigure = true; buildPhase = "make prefix=$out MANPAGE_DOCBOOK_XSL=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl all doc"; installPhase = "make prefix=$out install install_doc"; diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix index 9871afb0de68..0eb71492be3e 100644 --- a/pkgs/servers/foundationdb/vsmake.nix +++ b/pkgs/servers/foundationdb/vsmake.nix @@ -20,7 +20,7 @@ let sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; }; - configurePhase = ":"; + dontConfigure = true; buildPhase = ":"; installPhase = "mkdir -p $out/include && cp -R boost $out/include/"; }; diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix index 6880a49b4db7..b9c549d670bf 100644 --- a/pkgs/tools/archivers/unp/default.nix +++ b/pkgs/tools/archivers/unp/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { name = "unp_2.0_pre7+nmu1.tar.bz2"; }; - configurePhase = "true"; + dontConfigure = true; buildPhase = "true"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index 6a2a3a5a46e8..1f8a98e0296b 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libGL ]; - configurePhase = "true"; + dontConfigure = true; buildPhase = " $CC src/xdemos/{glxinfo.c,glinfo_common.c} -o glxinfo -lGL -lX11 diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix index 513439989501..c27eacaec8a2 100644 --- a/pkgs/tools/graphics/rocket/default.nix +++ b/pkgs/tools/graphics/rocket/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase ]; - configurePhase = ":"; + dontConfigure = true; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/hdfjava/default.nix b/pkgs/tools/misc/hdfjava/default.nix index 553e78c58a7f..0fe72425d79c 100644 --- a/pkgs/tools/misc/hdfjava/default.nix +++ b/pkgs/tools/misc/hdfjava/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake javac ]; - configurePhase = "true"; + dontConfigure = true; buildPhase = "./build-hdfjava-unix.sh"; installPhase = '' mkdir -p $out diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/tools/networking/wrk2/default.nix index 5caad0874f7c..e2e638ad485b 100644 --- a/pkgs/tools/networking/wrk2/default.nix +++ b/pkgs/tools/networking/wrk2/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --replace 'struct luaL_reg ' 'struct luaL_Reg ' ''; - configurePhase = ":"; + dontConfigure = true; installPhase = '' mkdir -p $out/bin mv ./wrk $out/bin/wrk2 diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 953c25de0e8d..6df20d926d7f 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -334,7 +334,7 @@ let version = "2.12"; src = external.rtags.src; - configurePhase = ":"; + dontConfigure = true; propagatedUserEnvPkgs = [ external.rtags ]; recipe = writeText "recipe" '' -- cgit 1.4.1 From 4a88f4ebfcfb7bf8c5df473e5a77f64d9c93b91e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 19 Jun 2019 11:37:51 -0400 Subject: setup.sh: add dontUnpack --- pkgs/stdenv/generic/setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 38453aa61bb0..ebcedce60b87 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1283,6 +1283,7 @@ genericBuild() { fi for curPhase in $phases; do + if [[ "$curPhase" = unpackPhase && -n "${dontUnpack:-}" ]]; then continue; fi if [[ "$curPhase" = configurePhase && -n "${dontConfigure:-}" ]]; then continue; fi if [[ "$curPhase" = buildPhase && -n "${dontBuild:-}" ]]; then continue; fi if [[ "$curPhase" = checkPhase && -z "${doCheck:-}" ]]; then continue; fi -- cgit 1.4.1 From b10e4624041cbbc824c034ee91bdca90d1132958 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 19 Jun 2019 11:39:33 -0400 Subject: doc/stdenv: describe dontUnpack --- doc/stdenv.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 9de912274dc7..1dd8ea8cabab 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -987,6 +987,17 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] + + + dontUnpack + + + + Set to true to skip the unpack phase. + + + + dontMakeSourcesWritable -- cgit 1.4.1 From 3f4a353737f165d4935c0404404c0de6eea92093 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 19 Jun 2019 11:45:34 -0400 Subject: treewide: use dontUnpack --- maintainers/scripts/nixpkgs-lint.nix | 2 +- nixos/lib/testing.nix | 2 +- nixos/lib/testing/jquery.nix | 2 +- nixos/modules/services/misc/gitlab.nix | 4 ++-- nixos/modules/virtualisation/openvswitch.nix | 2 +- nixos/tests/hydra/default.nix | 2 +- pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix | 2 +- pkgs/applications/editors/emacs-modes/quack/default.nix | 2 +- pkgs/applications/editors/emacs-modes/stgit/default.nix | 2 +- pkgs/applications/editors/emacs-modes/zeitgeist/default.nix | 2 +- pkgs/applications/editors/standardnotes/default.nix | 2 +- pkgs/applications/editors/yi/wrapper.nix | 2 +- pkgs/applications/graphics/graphicsmagick/compat.nix | 2 +- pkgs/applications/misc/jbidwatcher/default.nix | 2 +- pkgs/applications/misc/vcal/default.nix | 2 +- pkgs/applications/networking/browsers/tor-browser-bundle/default.nix | 2 +- .../networking/browsers/tor-browser-bundle/extensions.nix | 2 +- pkgs/applications/networking/instant-messengers/rambox/default.nix | 2 +- .../networking/instant-messengers/rambox/sencha/default.nix | 2 +- .../networking/instant-messengers/skypeforlinux/default.nix | 2 +- pkgs/applications/networking/instant-messengers/slack/dark-theme.nix | 2 +- pkgs/applications/networking/instant-messengers/slack/default.nix | 2 +- pkgs/applications/networking/instant-messengers/viber/default.nix | 2 +- pkgs/applications/networking/jnetmap/default.nix | 4 ++-- pkgs/applications/office/jabref/default.nix | 2 +- pkgs/applications/office/mendeley/default.nix | 2 +- pkgs/applications/science/math/sage/sage-tests.nix | 2 +- pkgs/applications/science/math/sage/sage.nix | 4 ++-- pkgs/build-support/docker/nix-prefetch-docker.nix | 2 +- pkgs/build-support/rust/fetchcargo.nix | 2 +- pkgs/common-updater/scripts.nix | 2 +- pkgs/data/fonts/migmix/default.nix | 2 +- pkgs/data/fonts/migu/default.nix | 2 +- pkgs/data/fonts/poly/default.nix | 2 +- pkgs/data/misc/nixos-artwork/wallpapers.nix | 2 +- pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix | 2 +- pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix | 2 +- pkgs/development/compilers/scala/dotty.nix | 2 +- pkgs/development/interpreters/jython/default.nix | 2 +- pkgs/development/interpreters/rascal/default.nix | 2 +- pkgs/development/libraries/elf-header/default.nix | 2 +- pkgs/development/pharo/vm/share.nix | 2 +- pkgs/development/python-modules/distutils-cfg/default.nix | 2 +- pkgs/development/python-modules/recursive-pth-loader/default.nix | 2 +- pkgs/development/tools/analysis/checkstyle/default.nix | 2 +- pkgs/development/tools/build-managers/leiningen/default.nix | 2 +- pkgs/development/tools/build-managers/mill/default.nix | 2 +- pkgs/development/tools/clang-tools/default.nix | 2 +- pkgs/development/tools/database/schemaspy/default.nix | 2 +- pkgs/development/tools/misc/bossa/default.nix | 2 +- pkgs/development/tools/misc/checkbashisms/default.nix | 2 +- pkgs/development/tools/parsing/antlr/3.4.nix | 2 +- pkgs/development/tools/parsing/antlr/3.5.nix | 2 +- pkgs/development/tools/parsing/antlr/4.7.nix | 2 +- pkgs/development/tools/selenium/htmlunit-driver/default.nix | 2 +- pkgs/development/tools/selenium/selendroid/default.nix | 2 +- pkgs/development/tools/selenium/server/default.nix | 2 +- pkgs/games/runelite/default.nix | 2 +- pkgs/games/simutrans/default.nix | 2 +- pkgs/misc/cups/drivers/hll2390dw-cups/default.nix | 2 +- pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix | 2 +- pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix | 2 +- pkgs/misc/emulators/ccemux/default.nix | 2 +- pkgs/os-specific/linux/nmon/default.nix | 2 +- pkgs/os-specific/linux/rfkill/udev.nix | 2 +- pkgs/servers/jetbrains/youtrack.nix | 2 +- pkgs/servers/metabase/default.nix | 2 +- pkgs/servers/search/elasticsearch/plugins.nix | 2 +- pkgs/test/patch-shebangs/default.nix | 4 ++-- pkgs/test/stdenv-inputs/default.nix | 4 ++-- pkgs/tools/compression/mozlz4a/default.nix | 2 +- pkgs/tools/graphics/eplot/default.nix | 2 +- pkgs/tools/graphics/zxing/default.nix | 2 +- pkgs/tools/inputmethods/ibus/default.nix | 4 ++-- pkgs/tools/misc/graylog/plugins.nix | 2 +- pkgs/tools/misc/mongodb-compass/default.nix | 2 +- pkgs/tools/misc/woof/default.nix | 4 ++-- pkgs/tools/misc/x11idle/default.nix | 2 +- pkgs/tools/networking/nuttcp/default.nix | 2 +- pkgs/tools/networking/quickserve/default.nix | 2 +- pkgs/tools/package-management/nix-prefetch-scripts/default.nix | 2 +- pkgs/tools/virtualization/amazon-ecs-cli/default.nix | 2 +- pkgs/tools/virtualization/aws/default.nix | 4 ++-- pkgs/top-level/php-packages.nix | 2 +- 84 files changed, 92 insertions(+), 92 deletions(-) diff --git a/maintainers/scripts/nixpkgs-lint.nix b/maintainers/scripts/nixpkgs-lint.nix index be2a92509f87..6d99c94bf33e 100644 --- a/maintainers/scripts/nixpkgs-lint.nix +++ b/maintainers/scripts/nixpkgs-lint.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { buildInputs = [ makeWrapper perl perlPackages.XMLSimple ]; - unpackPhase = "true"; + dontUnpack = true; buildPhase = "true"; installPhase = diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index a13e76a69560..767068771036 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -24,7 +24,7 @@ in rec { buildInputs = [ makeWrapper perl ]; - unpackPhase = "true"; + dontUnpack = true; preferLocalBuild = true; diff --git a/nixos/lib/testing/jquery.nix b/nixos/lib/testing/jquery.nix index 103721cadc38..e272f66a5765 100644 --- a/nixos/lib/testing/jquery.nix +++ b/nixos/lib/testing/jquery.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1v956yf5spw0156rni5z77hzqwmby7ajwdcd6mkhb6zvl36awr90"; }; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 71277b48ecd9..576ca7bfc055 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -149,7 +149,7 @@ let name = "gitlab-rake"; buildInputs = [ pkgs.makeWrapper ]; dontBuild = true; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rake $out/bin/gitlab-rake \ @@ -164,7 +164,7 @@ let name = "gitlab-rails"; buildInputs = [ pkgs.makeWrapper ]; dontBuild = true; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rails $out/bin/gitlab-rails \ diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index 47e07e7432cb..edec37402308 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -54,7 +54,7 @@ in { # The path to the an initialized version of the database db = pkgs.stdenv.mkDerivation { name = "vswitch.db"; - unpackPhase = "true"; + dontUnpack = true; buildPhase = "true"; buildInputs = with pkgs; [ cfg.package diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index 882bced86d39..f99b367ac9b7 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -17,7 +17,7 @@ let createTrivialProject = pkgs.stdenv.mkDerivation { name = "create-trivial-project"; - unpackPhase = ":"; + dontUnpack = true; buildInputs = [ pkgs.makeWrapper ]; installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh"; postFixup = '' diff --git a/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix b/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix index ce5522571339..a08f138bed95 100644 --- a/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix +++ b/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ emacs ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p "$out/share/emacs/site-lisp" diff --git a/pkgs/applications/editors/emacs-modes/quack/default.nix b/pkgs/applications/editors/emacs-modes/quack/default.nix index 29b3a72e9f0d..94cb3104ecc6 100644 --- a/pkgs/applications/editors/emacs-modes/quack/default.nix +++ b/pkgs/applications/editors/emacs-modes/quack/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ emacs ]; - unpackPhase = "true"; + dontUnpack = true; dontConfigure = true; installPhase = "true"; diff --git a/pkgs/applications/editors/emacs-modes/stgit/default.nix b/pkgs/applications/editors/emacs-modes/stgit/default.nix index 6460ee53abdc..b615accd721f 100644 --- a/pkgs/applications/editors/emacs-modes/stgit/default.nix +++ b/pkgs/applications/editors/emacs-modes/stgit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "stgit"; name = "${pname}-2009-10-28"; - unpackPhase = "true"; + dontUnpack = true; src = fetchurl { url = "https://raw.githubusercontent.com/miracle2k/stgit/master/contrib/stgit.el"; diff --git a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix b/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix index 3461787ab59c..9403a51df532 100644 --- a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix +++ b/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "zeitgeist-20120221"; - unpackPhase = "true"; + dontUnpack = true; src = fetchurl { url = "https://raw.githubusercontent.com/alexmurray/dotfiles/master/.emacs.d/vendor/zeitgeist.el"; diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 454b7ad554ba..d20f413700e8 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ appimage-run ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/{bin,share} diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix index e20c0a3cbca7..a90275638dc8 100644 --- a/pkgs/applications/editors/yi/wrapper.nix +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { name = "yi-custom-${version}"; version = "0.0.0.1"; - unpackPhase = "true"; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; buildCommand = '' diff --git a/pkgs/applications/graphics/graphicsmagick/compat.nix b/pkgs/applications/graphics/graphicsmagick/compat.nix index bd1ce2ed893a..fedcafc59788 100644 --- a/pkgs/applications/graphics/graphicsmagick/compat.nix +++ b/pkgs/applications/graphics/graphicsmagick/compat.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "graphicsmagick-imagemagick-compat-${version}"; inherit (graphicsmagick) version; - unpackPhase = "true"; + dontUnpack = true; buildPhase = "true"; utils = [ diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index 72a24026a89d..5939d7789b4e 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { jarfile = "$out/share/java/${pname}/JBidwatcher.jar"; - unpackPhase = "true"; + dontUnpack = true; dontBuild = true; diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix index 7649785524f1..5cd8de43729b 100644 --- a/pkgs/applications/misc/vcal/default.nix +++ b/pkgs/applications/misc/vcal/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; # for pod2man - unpackPhase = ":"; + dontUnpack = true; dontBuild = true; installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index b5ceae82ac02..dbe4ddca10f4 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { buildInputs = [ tor-browser-unwrapped tor ]; - unpackPhase = ":"; + dontUnpack = true; buildPhase = ":"; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix index 86c2f53b9add..bddac77d1d69 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix @@ -56,7 +56,7 @@ sha256 = "1fzspdiwhjabwz1yxb3gzj7giz9jbc1xxm65i93rvhzcp537cs42"; }; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' install -m 444 -D $src "$out/$extid.xpi" diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index db488c2f670e..eeab5e32c0f2 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - unpackPhase = ":"; + dontUnpack = true; dontWrapGApps = true; # we only want $gappsWrapperArgs here diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix index 1ca04a9e1686..4be8edaf9b85 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' makeWrapper ${sencha-bare}/sencha $out/bin/sencha diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 8f15c08cfc69..7ef42f8ddfdf 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation { buildInputs = [ dpkg ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p $out dpkg -x $src $out diff --git a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix index 11e2e5baed87..76987d08ff4b 100644 --- a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix +++ b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { inherit sha256; }; - unpackPhase = "true"; + dontUnpack = true; buildCommand = '' mkdir $out diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index bd1a39565592..6ce33d4f0471 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - unpackPhase = "true"; + dontUnpack = true; buildCommand = '' mkdir -p $out dpkg -x $src $out diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index d7c70232b0ad..a4bf26a0b1af 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ dpkg makeWrapper ]; - unpackPhase = "true"; + dontUnpack = true; libPath = stdenv.lib.makeLibraryPath [ alsaLib diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/applications/networking/jnetmap/default.nix index af94db23c0ac..8967a5d824aa 100644 --- a/pkgs/applications/networking/jnetmap/default.nix +++ b/pkgs/applications/networking/jnetmap/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "jnetmap-${version}"; version = "0.5.4"; - + src = fetchurl { url = "mirror://sourceforge/project/jnetmap/jNetMap%20${version}/jNetMap-${version}.jar"; sha256 = "0nxsfa600jhazwbabxmr9j37mhwysp0fyrvczhv3f1smiy8rjanl"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ jre makeWrapper ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 5dfd03570121..ebd5a14ad047 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings-desktop-schemas ]; - unpackPhase = "#"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin $out/share/java $out/share/icons diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 7ead0fe7348a..3c4434f0098c 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation { propagatedUserEnvPkgs = [ gconf ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' dpkg-deb -x $src $out diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix index 12433e12fe90..591fa192d563 100644 --- a/pkgs/applications/science/math/sage/sage-tests.nix +++ b/pkgs/applications/science/math/sage/sage-tests.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { sage-with-env ]; - unpackPhase = "#do nothing"; + dontUnpack = true; configurePhase = "#do nothing"; buildPhase = "#do nothing"; diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index 541b9cb36dc2..f6dc21d00184 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -11,7 +11,7 @@ # A wrapper that makes sure sage finds its docs (if they were build) and the # jupyter kernel spec. -let +let # generate kernel spec + default kernels kernel-specs = jupyter-kernel.create { definitions = jupyter-kernel.default // { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sage-tests ]; - unpackPhase = "#do nothing"; + dontUnpack = true; configurePhase = "#do nothing"; buildPhase = "#do nothing"; diff --git a/pkgs/build-support/docker/nix-prefetch-docker.nix b/pkgs/build-support/docker/nix-prefetch-docker.nix index 03a936e08e0c..c1d86adc6d81 100644 --- a/pkgs/build-support/docker/nix-prefetch-docker.nix +++ b/pkgs/build-support/docker/nix-prefetch-docker.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' install -vD ${./nix-prefetch-docker} $out/bin/$name; diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index e8465ba61624..4e6058383d48 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -3,7 +3,7 @@ let cargo-vendor-normalise = stdenv.mkDerivation { name = "cargo-vendor-normalise"; src = ./cargo-vendor-normalise.py; nativeBuildInputs = [ python3.pkgs.wrapPython ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = "install -D $src $out/bin/cargo-vendor-normalise"; pythonPath = [ python3.pkgs.toml ]; postFixup = "wrapPythonPrograms"; diff --git a/pkgs/common-updater/scripts.nix b/pkgs/common-updater/scripts.nix index 8a122b74b23c..1bec4a73996f 100644 --- a/pkgs/common-updater/scripts.nix +++ b/pkgs/common-updater/scripts.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { buildInputs = [ makeWrapper ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/data/fonts/migmix/default.nix index 9507819fe497..228952aaa56d 100644 --- a/pkgs/data/fonts/migmix/default.nix +++ b/pkgs/data/fonts/migmix/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }) ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' find $srcs -name '*.ttf' -exec install -m644 -Dt $out/share/fonts/truetype/migmix {} \; diff --git a/pkgs/data/fonts/migu/default.nix b/pkgs/data/fonts/migu/default.nix index 57fbf1a830fc..193e98d01a4b 100644 --- a/pkgs/data/fonts/migu/default.nix +++ b/pkgs/data/fonts/migu/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }) ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' find $srcs -name '*.ttf' | xargs install -m644 --target $out/share/fonts/truetype/migu -D diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix index d291d50e8364..24155f2ea546 100644 --- a/pkgs/data/fonts/poly/default.nix +++ b/pkgs/data/fonts/poly/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p $out/share/fonts/opentype diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix index 50f874baa4ae..3983869a4528 100644 --- a/pkgs/data/misc/nixos-artwork/wallpapers.nix +++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -6,7 +6,7 @@ let stdenv.mkDerivation { inherit name src; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p $out/share/artwork/gnome diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix index cc71e0026324..9728b2f96c48 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation { name = "docbook-sgml-3.1"; - unpackPhase = "true"; + dontUnpack = true; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix index dc7ebf5959da..78b99081504d 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation { name = "docbook-sgml-4.1"; - unpackPhase = "true"; + dontUnpack = true; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/compilers/scala/dotty.nix b/pkgs/development/compilers/scala/dotty.nix index a999bd422e63..7bc7fa3d4c24 100644 --- a/pkgs/development/compilers/scala/dotty.nix +++ b/pkgs/development/compilers/scala/dotty.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { name = "dotty-${dotty-bare.version}"; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix index 3d82535d29aa..f822fdd9c8f0 100644 --- a/pkgs/development/interpreters/jython/default.nix +++ b/pkgs/development/interpreters/jython/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -pv $out/bin diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index 25e125b9af63..22eee0f6ead8 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper jdk ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/development/libraries/elf-header/default.nix index 47b39eeb7e97..c1764e83c303 100644 --- a/pkgs/development/libraries/elf-header/default.nix +++ b/pkgs/development/libraries/elf-header/default.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation { src = null; - unpackPhase = "true"; + dontUnpack = true; dontBuild = true; diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix index 75ce2ff771c9..3bd72434eb3c 100644 --- a/pkgs/development/pharo/vm/share.nix +++ b/pkgs/development/pharo/vm/share.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.0"; name = "pharo-share-${version}"; - unpackPhase = "true"; + dontUnpack = true; sources10Zip = fetchurl { url = http://files.pharo.org/sources/PharoV10.sources.zip; diff --git a/pkgs/development/python-modules/distutils-cfg/default.nix b/pkgs/development/python-modules/distutils-cfg/default.nix index 204f4de5456a..cbf12c17582a 100644 --- a/pkgs/development/python-modules/distutils-cfg/default.nix +++ b/pkgs/development/python-modules/distutils-cfg/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { buildInputs = [ python ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' dest="$out/lib/${python.libPrefix}/site-packages/distutils" diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix index 359b482a1682..aaa095c53980 100644 --- a/pkgs/development/python-modules/recursive-pth-loader/default.nix +++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0"; name = pname + "-" + version; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ python ]; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 5b80a5079b6e..6ad7ca84a725 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' runHook preInstall diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 99692d1ef50c..d73683287a1e 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { JARNAME = "${name}-standalone.jar"; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ makeWrapper ]; propagatedBuildInputs = [ jdk ]; diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 7b472c1c4e3a..ff49bea526a1 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - unpackPhase = "true"; + dontUnpack = true; dontConfigure = true; dontBuild = true; diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix index bd8401ac80dd..0fcaee574681 100644 --- a/pkgs/development/tools/clang-tools/default.nix +++ b/pkgs/development/tools/clang-tools/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation { name = "clang-tools-${version}"; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin for tool in \ diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix index ab62fdf3d523..128921a67d7a 100644 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ b/pkgs/development/tools/database/schemaspy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ph1l62hy163m2hgybhkccqbcj6brna1vdbr7536zc37lzjxq9rn"; }; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ jre diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix index bb81a461188a..0d78cfbbab8c 100644 --- a/pkgs/development/tools/misc/bossa/default.nix +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -7,7 +7,7 @@ let bin2c = stdenv.mkDerivation { name = "bossa-bin2c"; src = ./bin2c.c; - unpackPhase = "true"; + dontUnpack = true; buildPhase = ''cc $src -o bin2c''; installPhase = ''mkdir -p $out/bin; cp bin2c $out/bin/''; }; diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 2564b42731b3..5f98df54c0a0 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; # The link returns directly the script. No need for unpacking - unpackPhase = "true"; + dontUnpack = true; installPhase = '' install -D -m755 $src $out/bin/checkbashisms diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix index ad0ebbdebba0..b53116b888e1 100644 --- a/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/pkgs/development/tools/parsing/antlr/3.4.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1xqbam8vf04q5fasb0m2n1pn5dbp2yw763sj492ncq04c5mqcglx"; }; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p "$out"/{lib/antlr,bin} diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix index cf37287beff8..4c213ed1c4c2 100644 --- a/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/pkgs/development/tools/parsing/antlr/3.5.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0srjwxipwsfzmpi0v32d1l5lzk9gi5in8ayg33sq8wyp8ygnbji6"; }; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p "$out"/{lib/antlr,bin} diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix index 40f9bf74ac40..e6e54f8dab92 100644 --- a/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -41,7 +41,7 @@ let sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl"; }; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p "$out"/{share/java,bin} diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix index 03c3c23c7559..a8085399b3db 100644 --- a/pkgs/development/tools/selenium/htmlunit-driver/default.nix +++ b/pkgs/development/tools/selenium/htmlunit-driver/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1sd3cwpamcbq9pv0mvcm8x6minqrlb4i0r12q3jg91girqswm2dp"; }; - unpackPhase = "true"; + dontUnpack = true; installPhase = "install -D $src $out/share/lib/${name}/${name}.jar"; diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index dcc3893ee0de..82b6d7e1161a 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inherit name; inherit version; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ jdk makeWrapper ]; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 48bfbdd689b8..61b74ce108d6 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { sha256 = "11v340nm8vzqc2bkmbjfm9a7j4dj0bi9bfk8wdpfan0fb8prf772"; }; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index 4c06926ed506..a56365778fb1 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -30,7 +30,7 @@ buildInputs = [ makeWrapper ]; # colon is bash form of no-op (do nothing) - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/share/runelite diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index a97338f6f204..5cbb3c1796f1 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -70,7 +70,7 @@ let }: stdenv.mkDerivation { name = "simutrans-${pakName}"; - unpackPhase = "true"; + dontUnpack = true; preferLocalBuild = true; installPhase = let src = fetchurl { inherit url sha256; }; in '' diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix index 8357a452a2b1..55b0deea9717 100644 --- a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix +++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ cups ghostscript dpkg a2ps ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' dpkg-deb -x $src $out diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix index f69c972c9996..f31dd9061ec3 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ cups ghostscript dpkg a2ps ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' dpkg-deb -x $src $out diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index e22a159c428a..9d9535ce37b0 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ cups ghostscript dpkg a2ps ]; - unpackPhase = "true"; + dontUnpack = true; brprintconf_mfcj6510dw_script = '' #!${runtimeShell} diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix index f3ec6421339f..a560ecd0a21d 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/misc/emulators/ccemux/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { name = "ccemux-${version}"; src = jar; - unpackPhase = "true"; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix index bb00db9868e4..a80252d6412c 100644 --- a/pkgs/os-specific/linux/nmon/default.nix +++ b/pkgs/os-specific/linux/nmon/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses ]; - unpackPhase = ":"; + dontUnpack = true; buildPhase = "cc -o nmon ${src} -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -lm -g -D X86"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/os-specific/linux/rfkill/udev.nix index f9d6dc99db83..41dd3da9d31f 100644 --- a/pkgs/os-specific/linux/rfkill/udev.nix +++ b/pkgs/os-specific/linux/rfkill/udev.nix @@ -34,7 +34,7 @@ let in stdenv.mkDerivation { name = "rfkill-udev"; - unpackPhase = "true"; + dontUnpack = true; dontBuild = true; installPhase = '' diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index 0518a78f9d6b..bbf39e5be466 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' runHook preInstall diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index f8a5ae31ffef..dde0a547693c 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' makeWrapper ${jre}/bin/java $out/bin/metabase --add-flags "-jar $src" diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index e76d08061145..3a480bd74674 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -16,7 +16,7 @@ let }: stdenv.mkDerivation (a // { inherit installPhase; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ unzip ]; meta = a.meta // { platforms = elasticsearch.meta.platforms; diff --git a/pkgs/test/patch-shebangs/default.nix b/pkgs/test/patch-shebangs/default.nix index a82e5e1e1982..3e68d96004f2 100644 --- a/pkgs/test/patch-shebangs/default.nix +++ b/pkgs/test/patch-shebangs/default.nix @@ -3,7 +3,7 @@ let bad-shebang = stdenv.mkDerivation { name = "bad-shebang"; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin echo "#!/bin/sh" > $out/bin/test @@ -23,4 +23,4 @@ in runCommand "patch-shebangs-test" { echo "no" >&2 exit 1 fi -'' \ No newline at end of file +'' diff --git a/pkgs/test/stdenv-inputs/default.nix b/pkgs/test/stdenv-inputs/default.nix index 13fa985839d7..4db10e75086e 100644 --- a/pkgs/test/stdenv-inputs/default.nix +++ b/pkgs/test/stdenv-inputs/default.nix @@ -4,7 +4,7 @@ let foo = stdenv.mkDerivation { name = "foo-test"; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin $out/include $out/lib @@ -22,7 +22,7 @@ let name = "bar-test"; outputs = [ "out" "dev" ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin $dev/include $dev/lib diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index 19c160c62f5a..9b9de8d8302f 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1d1ai062kdms34bya9dlykkx011rj8d8nh5l7d76xj8k9kv4ssq6"; }; - unpackPhase = "true;"; + dontUnpack = true; installPhase = '' mkdir -p "$out/bin" "$out/${python3.sitePackages}/" diff --git a/pkgs/tools/graphics/eplot/default.nix b/pkgs/tools/graphics/eplot/default.nix index a98a5e0aaece..ad8d9ebc6a22 100644 --- a/pkgs/tools/graphics/eplot/default.nix +++ b/pkgs/tools/graphics/eplot/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ ruby ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix index a760336cfa38..3efb68e60d2b 100644 --- a/pkgs/tools/graphics/zxing/default.nix +++ b/pkgs/tools/graphics/zxing/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0fzxvvf5dqyrs5m9rqw4ffm9h1s27bi7q3jb1dam34s80q2rp2zq"; }; inherit jre; - unpackPhase = ''true''; + dontUnpack = true; installPhase = '' mkdir -p "$out/lib/java" "$out/bin" cp "${core_jar}" "${javase_jar}" "$out/lib/java" diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 31ac23b395c7..d2090d776762 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -33,7 +33,7 @@ let }; emojiData = stdenv.mkDerivation { name = "emoji-data-5.0"; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir $out ${builtins.toString (flip mapAttrsToList emojiSrcs (k: v: "cp ${v} $out/emoji-${k}.txt;"))} @@ -62,7 +62,7 @@ let }; ucd = stdenv.mkDerivation rec { name = "ucd-12.0.0"; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir $out ${builtins.toString (flip mapAttrsToList ucdSrcs (k: v: "cp ${v} $out/${k}.txt;"))} diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index dea71d146ed6..a8d571da7ebd 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -14,7 +14,7 @@ let }: stdenv.mkDerivation (a // { inherit installPhase; - unpackPhase = "true"; + dontUnpack = true; buildInputs = [ unzip ]; meta = a.meta // { platforms = graylog.meta.platforms; diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 840d4eacd378..f03b536c6156 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation { inherit src; buildInputs = [ dpkg ]; - unpackPhase = "true"; + dontUnpack = true; buildCommand = '' IFS=$'\n' diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/tools/misc/woof/default.nix index 1fd9f4567054..35da2e0a4e94 100644 --- a/pkgs/tools/misc/woof/default.nix +++ b/pkgs/tools/misc/woof/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "2012-05-31"; name = "woof-${version}"; - + src = fetchurl { url = "http://www.home.unix-ag.org/simon/woof-${version}.py"; sha256 = "d84353d07f768321a1921a67193510bf292cf0213295e8c7689176f32e945572"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ python ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/tools/misc/x11idle/default.nix index c8adff788c71..f4a397ed9ddc 100644 --- a/pkgs/tools/misc/x11idle/default.nix +++ b/pkgs/tools/misc/x11idle/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ libXScrnSaver libX11 ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix index 34a34ef903d2..2ed9c330181c 100644 --- a/pkgs/tools/networking/nuttcp/default.nix +++ b/pkgs/tools/networking/nuttcp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1yang94mcdqg362qbi85b63746hk6gczxrk619hyj91v5763n4vx"; }; - unpackPhase = ":"; + dontUnpack = true; buildPhase = '' cc -O2 -o nuttcp $src diff --git a/pkgs/tools/networking/quickserve/default.nix b/pkgs/tools/networking/quickserve/default.nix index d83784f9989c..22589582e3b9 100644 --- a/pkgs/tools/networking/quickserve/default.nix +++ b/pkgs/tools/networking/quickserve/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation { pname = "quickserve"; version = "2018"; - unpackPhase = ":"; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index ba47847f28b6..c23db106ea1f 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -8,7 +8,7 @@ let mkPrefetchScript = tool: src: deps: nativeBuildInputs = [ makeWrapper ]; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' install -vD ${src} $out/bin/$name; diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index 1578a759ec7d..f62fdd2f78fb 100644 --- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "12q167pbpxw38p1bzcy9z4ix7yh9giwkyrc4vq2qln3pjn9d31rj"; }; - unpackPhase = ":"; + dontUnpack = true; installPhase = '' diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix index 893d4f2aec23..618a45075c95 100644 --- a/pkgs/tools/virtualization/aws/default.nix +++ b/pkgs/tools/virtualization/aws/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "aws-1.75"; - + src = fetchurl { url = https://raw.github.com/timkay/aws/2f2ff99f9f5111ea708ae6cd14d20e264748e72b/aws; sha256 = "0d5asv73a58yb1bb1jpsw3c7asd62y86z5fwpg4llhjzkx79maj6"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ perl ]; - unpackPhase = "true"; + dontUnpack = true; installPhase = '' diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 114b107418d9..eb389587c03b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -81,7 +81,7 @@ let sha256 = "0hnm7njab9nsifpb1qbwx54yfpsi00g8mzny11s13ibjvd9rnvxn"; }; - unpackPhase = ":"; + dontUnpack = true; nativeBuildInputs = [ pkgs.makeWrapper ]; -- cgit 1.4.1 From fcab0697f4e4dc82b0d16389cb69ae67389550ef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 1 Jul 2019 06:41:41 -0700 Subject: flashrom: 1.0.1 -> 1.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/flashrom/versions --- pkgs/tools/misc/flashrom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index b45df3f57b56..a7ca7700c71b 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "flashrom-${version}"; - version = "1.0.1"; + version = "1.1"; src = fetchurl { url = "https://download.flashrom.org/releases/flashrom-v${version}.tar.bz2"; - sha256 = "0i6yrrl69hrqmwd7azj7x3j46m0qpvzmk3b5basym7mnlpfzhyfm"; + sha256 = "06afq680n9p34hi3vrkn12vd1pfyq2062db9qqbi4hi21k3skbdf"; }; # Newer versions of libusb deprecate some API flashrom uses. -- cgit 1.4.1 From 0eb483819191a61bdef2674f6a52a415de0f99cd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 1 Jul 2019 05:48:12 -0700 Subject: expat: 2.2.6 -> 2.2.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/expat/versions --- pkgs/development/libraries/expat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 7e4d46c012dd..ef2574019459 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "expat-2.2.6"; + name = "expat-2.2.7"; src = fetchurl { url = "mirror://sourceforge/expat/${name}.tar.bz2"; - sha256 = "1wl1x93b5w457ddsdgj0lh7yjq4q6l7wfbgwhagkc8fm2qkkrd0p"; + sha256 = "067cfhqwiswm4zynw7xaxl59mrrimaiyjhnn8byxma1i98pi1jfb"; }; outputs = [ "out" "dev" ]; # TODO: fix referrers -- cgit 1.4.1 From f2a499549f10e7a5e47e6c066f8081d6dac03881 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 1 Jul 2019 15:19:15 -0400 Subject: nixos/httpd: drop mercurial httpd subservice --- nixos/doc/manual/release-notes/rl-1909.xml | 5 ++ .../web-servers/apache-httpd/mercurial.nix | 75 ---------------------- 2 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 nixos/modules/services/web-servers/apache-httpd/mercurial.nix diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 3c0699b4b539..0b3d2d0c4fd8 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -297,6 +297,11 @@ phd service have been removed from nixpkgs due to lack of maintainer. + + + The mercurial httpd.extraSubservice has been removed from nixpkgs due to lack of maintainer. + + diff --git a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix deleted file mode 100644 index 4b8ee2b17ea7..000000000000 --- a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ config, pkgs, lib, ... }: - -let - inherit (pkgs) mercurial; - inherit (lib) mkOption; - - urlPrefix = config.urlPrefix; - - cgi = pkgs.stdenv.mkDerivation { - name = "mercurial-cgi"; - buildCommand = '' - mkdir -p $out - cp -v ${mercurial}/share/cgi-bin/hgweb.cgi $out - sed -i "s|/path/to/repo/or/config|$out/hgweb.config|" $out/hgweb.cgi - echo " - [collections] - ${config.dataDir} = ${config.dataDir} - [web] - style = gitweb - allow_push = * - " > $out/hgweb.config - ''; - }; - -in { - - extraConfig = '' - RewriteEngine on - RewriteRule /(.*) ${cgi}/hgweb.cgi/$1 - - - AuthType Basic - AuthName "Mercurial repositories" - AuthUserFile ${config.dataDir}/hgusers - - Require valid-user - - - - Order allow,deny - Allow from all - AllowOverride All - Options ExecCGI - AddHandler cgi-script .cgi - PassEnv PYTHONPATH - - ''; - - robotsEntries = '' - User-agent: * - Disallow: ${urlPrefix} - ''; - - extraServerPath = [ pkgs.python ]; - - globalEnvVars = [ { name = "PYTHONPATH"; value = "${mercurial}/lib/${pkgs.python.libPrefix}/site-packages"; } ]; - - options = { - urlPrefix = mkOption { - default = "/hg"; - description = " - The URL prefix under which the Mercurial service appears. - Use the empty string to have it appear in the server root. - "; - }; - - dataDir = mkOption { - example = "/data/mercurial"; - description = " - Path to the directory that holds the repositories. - "; - }; - }; - -} -- cgit 1.4.1 From 62ba77787c7db01e2b4cb793b69cb19eeb7c3d8f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 1 Jul 2019 13:59:32 -0700 Subject: leatherman: 1.6.0 -> 1.7.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/leatherman/versions --- pkgs/development/libraries/leatherman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 9ab68e578fbf..95924050ff32 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { - sha256 = "1dy1iisc0h1l28ff72pq7vxa4mj5zpq2jflpdghhx8yqksxhii4k"; + sha256 = "0n6vcbc43hdaxg5inl2b43bsksdkj3k0qxis6gkkclipivp8pz0p"; rev = version; repo = "leatherman"; owner = "puppetlabs"; -- cgit 1.4.1 From 54fa84b988d2fdfcc9c2073cbd197a8c1a107197 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Jul 2019 01:41:46 -0700 Subject: python37Packages.aiorpcx: 0.17.0 -> 0.18.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-aiorpcx/versions --- pkgs/development/python-modules/aiorpcx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix index a5f54d8e96cf..6350e3f0441a 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.17.0"; + version = "0.18.3"; src = fetchPypi { inherit version; pname = "aiorpcX"; - sha256 = "14np5r75rs0v45vsv20vbzmnv3qisvm9mdllj1j9s1633cvcik0k"; + sha256 = "0k545hc7wl6sh1svydzbv6x7sx5pig2pqkl3yxs9riwmvzawx9xp"; }; propagatedBuildInputs = [ attrs ]; -- cgit 1.4.1 From 8def4eb3a1df36c5af53bf1f46b39b368e27e88f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Jul 2019 01:45:22 -0700 Subject: python37Packages.altair: 3.0.1 -> 3.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-altair/versions --- pkgs/development/python-modules/altair/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 9e3a97c1312e..4d78ad80cc32 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "altair"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "63934563a7a7b7186335858206a0b9be6043163b8b54a26cd3b3299a9e5e391f"; + sha256 = "1zdznkybw3g8fd280h5j5cnnwcv30610gp8fl8vwqda1w2p6pgvp"; }; postPatch = '' -- cgit 1.4.1 From a94a497dbcef9a981fedea4b768d32ae2f12db03 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 2 Jul 2019 04:20:00 -0500 Subject: postgresqlPackages.plv8: 2.3.11 -> 2.3.12 --- pkgs/servers/sql/postgresql/ext/plv8.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix index 4b7c1235ca95..b3befc58295b 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "plv8"; - version = "2.3.11"; + version = "2.3.12"; nativeBuildInputs = [ perl ]; buildInputs = [ v8 postgresql ]; @@ -11,26 +11,26 @@ stdenv.mkDerivation rec { owner = "plv8"; repo = "plv8"; rev = "v${version}"; - sha256 = "0bv2b8xxdqqhj6nwyc8kwhi5m5i7i1yl078sk3bnnc84b0mnza5x"; + sha256 = "1yi1ibiibvd0x4z5dm698w32ljrj3yr4j25jm1zkgkwd4ii8y644"; }; - makeFlags = [ "--makefile=Makefile.shared" ]; + makefile = "Makefile.shared"; + + buildFlags = [ "all" ]; preConfigure = '' patchShebangs ./generate_upgrade.sh ''; - buildPhase = "make -f Makefile.shared all"; - installPhase = '' - mkdir -p $out/bin + mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653 install -D plv8*.so -t $out/lib install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/postgresql/extension ''; meta = with stdenv.lib; { - description = "PL/v8 - A Procedural Language in JavaScript powered by V8"; - homepage = https://pgxn.org/dist/plv8/; + description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL"; + homepage = "https://plv8.github.io/"; maintainers = with maintainers; [ volth ]; platforms = platforms.linux; license = licenses.postgresql; -- cgit 1.4.1 From d4a372fdffd40bd17a8b341bb7f2d95357398e61 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Jul 2019 04:00:38 -0700 Subject: python37Packages.fido2: 0.5.0 -> 0.7.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-fido2/versions --- pkgs/development/python-modules/fido2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index 96ba82f6d980..8922d6e05195 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "fido2"; - version = "0.5.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1pl8d2pr6jzqj4y9qiaddhjgnl92kikjxy0bgzm2jshkzzic8mp3"; + sha256 = "11wdcjymw8y6wxgp29gbhdxff3lpc5yp5fcqnr5vnj88g192ic27"; }; propagatedBuildInputs = [ six cryptography ]; -- cgit 1.4.1 From d9ff8bf692e6d33ec334d4e60d2bffa26ed5d787 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Jul 2019 05:58:33 -0700 Subject: python37Packages.marshmallow-sqlalchemy: 0.16.3 -> 0.17.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-marshmallow-sqlalchemy/versions --- pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 01f80473feef..22f9b445d24f 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.16.3"; + version = "0.17.0"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0qzpl53r58fk328cn41365c6jkliwmj41v16zkyjxb9d4s2mvn14"; + sha256 = "17pnbv28n9vy3q66ckxfdbb9k1riy6s8lg63zfm5jsx00f0zqqnn"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; -- cgit 1.4.1 From aa0b2ccb9dd4ab5ef7bca243abf87302bff69d3e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Jul 2019 08:48:34 -0700 Subject: python37Packages.python-jsonrpc-server: 0.1.2 -> 0.2.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-python-jsonrpc-server/versions --- pkgs/development/python-modules/python-jsonrpc-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 027054920954..29c6950070a5 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "python-jsonrpc-server"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "palantir"; repo = "python-jsonrpc-server"; rev = version; - sha256 = "0k55rpywghapk5db8dgp2jj5v5654q6m571s1gcz1mpn2qxkz69l"; + sha256 = "054b0xm5z3f82jwp7zj21pkh7gwj9jd933jhymdx49n1n1iynfn0"; }; postPatch = '' -- cgit 1.4.1 From 7249ed1c7bfeaee038a013095abef736129895e6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 2 Jul 2019 19:02:32 -0700 Subject: ycmd: build with python3 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 001214093ee6..e264b3450c8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9878,7 +9878,7 @@ in ycmd = callPackage ../development/tools/misc/ycmd { inherit (darwin.apple_sdk.frameworks) Cocoa; - python = python2; + python = python3; }; yodl = callPackage ../development/tools/misc/yodl { }; -- cgit 1.4.1 From f7eee05a220370cced64f060f613354d284c0ab4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Jul 2019 19:39:31 -0700 Subject: unbound: 1.9.1 -> 1.9.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/unbound/versions --- pkgs/tools/networking/unbound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 69464c69f756..861a61c8f38f 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "https://unbound.net/downloads/${name}.tar.gz"; - sha256 = "1iarvk0i92asvrkpla9z55aan20k6pklzpck9yk4rfnchsdvzh63"; + sha256 = "15bbrczibap30db8a1pmqhvjbmkxms39hwiivby7f4j5rz2wwykg"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB -- cgit 1.4.1 From b46e5ea184f6ed358053140fb9279fe11f3e6977 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Jul 2019 17:36:41 +0000 Subject: buildPerlPackage: recognize "#!perl" as shebang --- pkgs/development/perl-modules/generic/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index e05cd07708d7..253e7e0bdc74 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -17,7 +17,7 @@ preConfigure() { first=$(dd if="$fn" count=2 bs=1 2> /dev/null) if test "$first" = "#!"; then echo "patching $fn..." - sed -i "$fn" -e "s|^#\!\(.*[ /]perl.*\)$|#\!\1$perlFlags|" + sed -i "$fn" -e "s|^#\!\(.*\bperl\b.*\)$|#\!\1$perlFlags|" fi fi done -- cgit 1.4.1 From 75aee3cfdba140f4d5030b6a143d3259dd1fe0a1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 1 Jul 2019 15:48:10 -0700 Subject: libuv: 1.29.1 -> 1.30.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libuv/versions --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index f5026da4c3b9..ade3f5796d51 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.29.1"; + version = "1.30.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0scnircr6khgh7l3bw9zyfzdgx2c11mpfhd9d8qlw47arrvqg7l8"; + sha256 = "0j26nh799962l1gn3v3sw1x6fnia2dx5irhl33nc77gy2gzayv07"; }; postPatch = let -- cgit 1.4.1 From 9db3a5869ee882787497a8d762cce99375606e62 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 1 Jul 2019 20:01:19 +0200 Subject: python2: backport fix for pyc race condition This is python bug https://bugs.python.org/issue13146. Fixed since python 3.4. It makes pyc creation atomic, preventing a race condition. The patch has been rebased on our deterministic build patch. It wasn't backported to python 2.7 because there was a complaint about changed semantics. Since files are now created in a temporary directory and then moved, symlinks will be overridden. See https://bugs.python.org/issue17222. That is an edge-case however. Ubuntu and debian have backported the fix in 2013 already, making it mainstream enough for us to adopt. --- .../python/cpython/2.7/atomic_pyc.patch | 41 ++++++++++++++++++++++ .../interpreters/python/cpython/2.7/default.nix | 6 ++++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch b/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch new file mode 100644 index 000000000000..56c75cbdeeaf --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch @@ -0,0 +1,41 @@ +diff --git a/Lib/py_compile.py b/Lib/py_compile.py +index 978da73..3559eb9 100644 +--- a/Lib/py_compile.py ++++ b/Lib/py_compile.py +@@ -120,16 +120,27 @@ def compile(file, cfile=None, dfile=None, doraise=False): + return + if cfile is None: + cfile = file + (__debug__ and 'c' or 'o') +- with open(cfile, 'wb') as fc: +- fc.write('\0\0\0\0') +- if "DETERMINISTIC_BUILD" in os.environ: ++ # Atomically write the pyc/pyo file. Issue #13146. ++ # id() is used to generate a pseudo-random filename. ++ path_tmp = '{}.{}'.format(cfile, id(cfile)) ++ try: ++ with open(path_tmp, 'wb') as fc: + fc.write('\0\0\0\0') +- else: +- wr_long(fc, timestamp) +- marshal.dump(codeobject, fc) +- fc.flush() +- fc.seek(0, 0) +- fc.write(MAGIC) ++ if "DETERMINISTIC_BUILD" in os.environ: ++ fc.write('\0\0\0\0') ++ else: ++ wr_long(fc, timestamp) ++ marshal.dump(codeobject, fc) ++ fc.flush() ++ fc.seek(0, 0) ++ fc.write(MAGIC) ++ os.rename(path_tmp, cfile) ++ except OSError: ++ try: ++ os.unlink(path_tmp) ++ except OSError: ++ pass ++ raise + + def main(args=None): + """Compile several source files. diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index e7d07b9ad1c0..1503c221bdd4 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -79,6 +79,12 @@ let sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57"; }) + # Fix race-condition during pyc creation. Has a slight backwards + # incompatible effect: pyc symlinks will now be overridden + # (https://bugs.python.org/issue17222). Included in python >= 3.4, + # backported in debian since 2013. + # https://bugs.python.org/issue13146 + ./atomic_pyc.patch ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ] ++ optionals stdenv.isLinux [ -- cgit 1.4.1 From e62b771433624b749dd0391ddbc7f2ba147cf21b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 1 Jul 2019 14:51:07 -0700 Subject: libinput: 1.13.2 -> 1.13.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libinput/versions --- pkgs/development/libraries/libinput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 651c43297082..0c759835183b 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.13.2"; + version = "1.13.4"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0vbapc90m49n0z8w8w4v0qf1iiwaixw9h79jfmps9pj8hdls17qx"; + sha256 = "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk"; }; outputs = [ "bin" "out" "dev" ]; -- cgit 1.4.1 From 2608669904e122c404b8fe54b4be6c6df6b9ac30 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sun, 23 Jun 2019 23:44:26 +0200 Subject: cmake: 3.13.4 -> 3.14.5 --- .../tools/build-managers/cmake/default.nix | 54 ++++++++++------------ .../cmake/libuv-application-services.patch | 30 ------------ .../tools/build-managers/cmake/search-path.patch | 23 +++++++-- 3 files changed, 44 insertions(+), 63 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 290860a0d9c3..4912049cbf6e 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -13,24 +13,20 @@ assert withQt5 -> useQt4 == false; assert useQt4 -> withQt5 == false; -with stdenv.lib; - let - os = stdenv.lib.optionalString; - majorVersion = "3.13"; - minorVersion = "4"; - # from https://cmake.org/files/v3.13/cmake-3.13.4-SHA-256.txt for cmake-3.13.4.tar.gz - sha256 = "fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b"; - version = "${majorVersion}.${minorVersion}"; + lib = stdenv.lib; + os = lib.optionalString; + version = "3.14.5"; + # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt + sha256 = "505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06"; in stdenv.mkDerivation rec { - name = "cmake-${os isBootstrap "boot-"}${os useNcurses "cursesUI-"}${os withQt5 "qt5UI-"}${os useQt4 "qt4UI-"}${version}"; - - inherit majorVersion; + pname = "cmake${os isBootstrap "-boot"}${os useNcurses "-cursesUI"}${os withQt5 "-qt5UI"}${os useQt4 "-qt4UI"}"; + inherit version; src = fetchurl { - url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; + url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; inherit sha256; }; @@ -43,7 +39,7 @@ stdenv.mkDerivation rec { # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d ./libuv-application-services.patch - ] ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch; + ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; outputs = [ "out" ]; setOutputFlags = false; @@ -52,21 +48,21 @@ stdenv.mkDerivation rec { buildInputs = [ setupHook pkgconfig ] - ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] - ++ optional useNcurses ncurses - ++ optional useQt4 qt4 - ++ optional withQt5 qtbase; + ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] + ++ lib.optional useNcurses ncurses + ++ lib.optional useQt4 qt4 + ++ lib.optional withQt5 qtbase; depsBuildBuild = [ buildPackages.stdenv.cc ]; - propagatedBuildInputs = optional stdenv.isDarwin ps; + propagatedBuildInputs = lib.optional stdenv.isDarwin ps; preConfigure = '' fixCmakeFiles . substituteInPlace Modules/Platform/UnixPaths.cmake \ - --subst-var-by libc_bin ${getBin stdenv.cc.libc} \ - --subst-var-by libc_dev ${getDev stdenv.cc.libc} \ - --subst-var-by libc_lib ${getLib stdenv.cc.libc} + --subst-var-by libc_bin ${lib.getBin stdenv.cc.libc} \ + --subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \ + --subst-var-by libc_lib ${lib.getLib stdenv.cc.libc} substituteInPlace Modules/FindCxxTest.cmake \ --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell} # BUILD_CC and BUILD_CXX are used to bootstrap cmake @@ -74,9 +70,9 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--docdir=share/doc/${name}" + "--docdir=share/doc/${pname}${version}" ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup - ++ optional (useQt4 || withQt5) "--qt-gui" + ++ lib.optional (useQt4 || withQt5) "--qt-gui" ++ [ "--" # We should set the proper `CMAKE_SYSTEM_NAME`. @@ -87,15 +83,15 @@ stdenv.mkDerivation rec { # package being built. "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++" "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc" - "-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" - "-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" - "-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" + "-DCMAKE_AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" + "-DCMAKE_RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" + "-DCMAKE_STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" ] # Avoid depending on frameworks. - ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF"; + ++ lib.optional (!useNcurses) "-DBUILD_CursesDialog=OFF"; # make install attempts to use the just-built cmake - preInstall = optional (stdenv.hostPlatform != stdenv.buildPlatform) '' + preInstall = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) '' sed -i 's|bin/cmake|${buildPackages.cmake}/bin/cmake|g' Makefile ''; @@ -108,7 +104,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails - meta = with stdenv.lib; { + meta = with lib; { homepage = http://www.cmake.org/; description = "Cross-Platform Makefile Generator"; platforms = if useQt4 then qt4.meta.platforms else platforms.all; diff --git a/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch b/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch index 08899f5c241f..c5b9cdff1d07 100644 --- a/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch +++ b/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch @@ -24,36 +24,6 @@ diff -ur cmake-3.12.1/Utilities/cmlibuv/CMakeLists.txt cmake-3.12.1-patched/Util endif() if(CMAKE_SYSTEM_NAME STREQUAL "Linux") -diff -ur cmake-3.12.1/Utilities/cmlibuv/src/unix/darwin-proctitle.c cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/darwin-proctitle.c ---- cmake-3.12.1/Utilities/cmlibuv/src/unix/darwin-proctitle.c 2018-08-09 21:14:08.000000000 +0900 -+++ cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/darwin-proctitle.c 2018-08-13 10:01:29.000000000 +0900 -@@ -26,9 +26,7 @@ - #include - #include - --#include -- --#if !TARGET_OS_IPHONE -+#if HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H - # include - # include - #endif -@@ -58,7 +56,7 @@ - - - int uv__set_process_title(const char* title) { --#if TARGET_OS_IPHONE -+#if !HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H - return uv__pthread_setname_np(title); - #else - CFStringRef (*pCFStringCreateWithCString)(CFAllocatorRef, -@@ -205,5 +203,5 @@ - dlclose(application_services_handle); - - return err; --#endif /* !TARGET_OS_IPHONE */ -+#endif /* HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H */ - } diff -ur cmake-3.12.1/Utilities/cmlibuv/src/unix/fsevents.c cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/fsevents.c --- cmake-3.12.1/Utilities/cmlibuv/src/unix/fsevents.c 2018-08-09 21:14:08.000000000 +0900 +++ cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/fsevents.c 2018-08-13 10:01:29.000000000 +0900 diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch index 6213138402b1..2f5e4d62c86d 100644 --- a/pkgs/development/tools/build-managers/cmake/search-path.patch +++ b/pkgs/development/tools/build-managers/cmake/search-path.patch @@ -38,12 +38,27 @@ diff -ur cmake-3.9.1/Modules/Platform/UnixPaths.cmake cmake-3.9.1-mod/Modules/Pl + @libc_lib@/lib ) - list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES -- /usr/include + if(CMAKE_SYSROOT_COMPILE) + set(_cmake_sysroot_compile "${CMAKE_SYSROOT_COMPILE}") + else() + set(_cmake_sysroot_compile "${CMAKE_SYSROOT}") + endif() + + # Default per-language values. These may be later replaced after + # parsing the implicit directory information from compiler output. + set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT + ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} +- "${_cmake_sysroot_compile}/usr/include" ++ @libc_dev@/include + ) + set(_CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES_INIT + ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} +- "${_cmake_sysroot_compile}/usr/include" + @libc_dev@/include ) - list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES -- /usr/include + set(_CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES_INIT + ${CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES} +- "${_cmake_sysroot_compile}/usr/include" + @libc_dev@/include ) -- cgit 1.4.1 From d87c843b6fb3db0bd0ca94f107c69d4714a15263 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Fri, 28 Jun 2019 10:00:46 +0200 Subject: Integrate review suggestions --- .../tools/build-managers/cmake/default.nix | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 4912049cbf6e..4761d8dc5b11 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes @@ -13,21 +13,18 @@ assert withQt5 -> useQt4 == false; assert useQt4 -> withQt5 == false; -let - lib = stdenv.lib; - os = lib.optionalString; - version = "3.14.5"; - # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06"; -in - stdenv.mkDerivation rec { - pname = "cmake${os isBootstrap "-boot"}${os useNcurses "-cursesUI"}${os withQt5 "-qt5UI"}${os useQt4 "-qt4UI"}"; - inherit version; + pname = "cmake" + + lib.optionalString isBootstrap "-boot" + + lib.optionalString useNcurses "-cursesUI" + + lib.optionalString withQt5 "-qt5UI" + + lib.optionalString useQt4 "-qt4UI"; + version = "3.14.5"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - inherit sha256; + # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt + sha256 = "505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06"; }; patches = [ -- cgit 1.4.1 From d055655954b30b901825d77881a38791d5b71981 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 20 Jun 2019 10:37:25 +0300 Subject: libssh2: 1.8.2 -> 1.9.0 --- pkgs/development/libraries/libssh2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 483a56dcdce6..d4205981499c 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libssh2"; - version = "1.8.2"; + version = "1.9.0"; src = fetchurl { url = "${meta.homepage}/download/${pname}-${version}.tar.gz"; - sha256 = "0rqd37pc80nm2pz4sa2m9pfc48axys7jwq1l7z0vii5nyvchg0q8"; + sha256 = "1zfsz9nldakfz61d2j70pk29zlmj7w2vv46s9l3x2prhcgaqpyym"; }; outputs = [ "out" "dev" "devdoc" ]; -- cgit 1.4.1 From 07fdb4f3d6c9e82f7807df342ebc07e1492466fd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 Jun 2019 06:19:16 -0700 Subject: speexdsp: 1.2rc3 -> 1.2.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/speexdsp/versions --- pkgs/development/libraries/speexdsp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 16be9fa1e3b1..4d74c7e05598 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, fftw }: stdenv.mkDerivation rec { - name = "speexdsp-1.2rc3"; + name = "speexdsp-1.2.0"; src = fetchurl { url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz"; - sha256 = "1wcjyrnwlkayb20zdhp48y260rfyzg925qpjpljd5x9r01h8irja"; + sha256 = "0wa7sqpk3x61zz99m7lwkgr6yv62ml6lfgs5xja65vlvdzy44838"; }; patches = [ ./build-fix.patch ]; -- cgit 1.4.1 From 97d1f95d9d795b6d60e45f565b570971a9e74a09 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Jun 2019 16:26:15 -0500 Subject: xorg.xkeyboardconfig: 2.24 -> 2.27 https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/tags/xkeyboard-config-2.27 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2ae444597f41..a5869b21c581 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2510,11 +2510,11 @@ lib.makeScope newScope (self: with self; { }) {}; xkeyboardconfig = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xkeyboard-config-2.24"; + name = "xkeyboard-config-2.27"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2; - sha256 = "1my4786pd7iv5x392r9skj3qclmbd26nqzvh2fllwkkbyj08bcci"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.27.tar.bz2; + sha256 = "07wh443lhwv1j0q6xnxnji7f7ahh7xphxj90fv02cdd6zv4aw3b9"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 6ae5443f2ed8..26c2721e2407 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -77,7 +77,7 @@ mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2 mirror://xorg/individual/app/xwud-1.0.5.tar.bz2 mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2 mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.27.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 -- cgit 1.4.1 From d41bc0ff569f199517becf0ca4da87f8e29b1254 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Jun 2019 16:33:46 -0500 Subject: xkeyboardconfig: drop no-longer-applying esperanto patch --- pkgs/servers/x11/xorg/overrides.nix | 3 -- pkgs/servers/x11/xorg/xkeyboard-config-eo.patch | 69 ------------------------- 2 files changed, 72 deletions(-) delete mode 100644 pkgs/servers/x11/xorg/xkeyboard-config-eo.patch diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 979577575a9d..7b6299105b1d 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -413,9 +413,6 @@ self: super: xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [intltool]; - #TODO: resurrect patches for US_intl? - patches = [ ./xkeyboard-config-eo.patch ]; - configureFlags = [ "--with-xkb-rules-symlink=xorg" ]; # 1: compatibility for X11/xkb location diff --git a/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch b/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch deleted file mode 100644 index 66f45a410f71..000000000000 --- a/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/rules/base.xml.in b/rules/base.xml.in -index ec321f8..e9c3546 100644 ---- a/rules/base.xml.in -+++ b/rules/base.xml.in -@@ -1786,6 +1786,13 @@ - - - -+ eo -+ <_shortDescription>Esp -+ <_description>Esperanto -+ -+ -+ -+ - ir - <_shortDescription>Irn - <_description>Iran -diff --git a/symbols/Makefile.am b/symbols/Makefile.am ---- a/symbols/Makefile.am -+++ b/symbols/Makefile.am -@@ -10,7 +10,7 @@ bt by braille \ - ca cd ch \ - ch cn cz \ - de dk dz \ --ee es et epo eu \ -+ee eo es et epo eu \ - fi fo fr \ - gb ge gh gn \ - gr hr hu \ -diff --git a/symbols/Makefile.in b/symbols/Makefile.in ---- a/symbols/Makefile.in -+++ b/symbols/Makefile.in -@@ -222,7 +222,7 @@ bt by braille \ - ca cd ch \ - ch cn cz \ - de dk dz \ --ee es et epo eu \ -+ee eo es et epo eu \ - fi fo fr \ - gb ge gh gn \ - gr hr hu \ -diff --git a/symbols/eo b/symbols/eo -new file mode 100644 -index 0000000..d6358c9 ---- /dev/null -+++ b/symbols/eo -@@ -0,0 +1,21 @@ -+// $XFree86$ -+ -+partial alphanumeric_keys -+xkb_symbols "basic" { -+ -+ // Describes the differences between a very simple en_US -+ // keyboard and a simple Esperanto keyboard -+ // Press AltGr or Windows Menu key together with C, H, J, S, U -+ // to get accented letters. -+ // 2001 by Radovan Garabik -+ -+ key.type = "FOUR_LEVEL"; -+ -+ key { [w,W, ubreve,Ubreve ] }; -+ key { [u,U, ubreve, Ubreve ] }; -+ key { [s,S, scircumflex, Scircumflex ] }; -+ key { [g,G, gcircumflex,Gcircumflex ] }; -+ key { [h,H, hcircumflex,Hcircumflex ] }; -+ key { [j,J, jcircumflex,Jcircumflex ] }; -+ key { [c,C, ccircumflex,Ccircumflex ] }; -+}; -- cgit 1.4.1 From ba3dd20f370adef238d6becb832ac4247b30dca3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 3 Jul 2019 07:17:11 -0700 Subject: vimPlugins.youcompleteme: Use python3 and update meta info --- pkgs/misc/vim-plugins/overrides.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 0aa0fde972d5..edfad00defd4 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -416,19 +416,19 @@ self: super: { youcompleteme = super.youcompleteme.overrideAttrs(old: { buildPhase = '' substituteInPlace plugin/youcompleteme.vim \ - --replace "'ycm_path_to_python_interpreter', '''" \ - "'ycm_path_to_python_interpreter', '${python}/bin/python'" + --replace "'ycm_python_interpreter_path', '''" \ + "'ycm_python_interpreter_path', '${python3}/bin/python'" rm -r third_party/ycmd ln -s ${ycmd}/lib/ycmd third_party ''; - meta = { + meta = with stdenv.lib; { description = "A code-completion engine for Vim"; - homepage = https://github.com/Valloric/YouCompleteMe; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [marcweber jagajaga]; - platforms = stdenv.lib.platforms.unix; + homepage = "https://github.com/Valloric/YouCompleteMe"; + license = licenses.gpl3; + maintainers = with maintainers; [ marcweber jagajaga ]; + platforms = platforms.unix; }; }); -- cgit 1.4.1 From cfb340c0774b1417b2c36d68dcd9627322932f5a Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak Date: Thu, 4 Jul 2019 01:49:53 -0600 Subject: adapta-backgrounds: 0.5.2.3 -> 0.5.3.1 --- pkgs/data/misc/adapta-backgrounds/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/pkgs/data/misc/adapta-backgrounds/default.nix index 41f704e750c5..1c35d3deef91 100644 --- a/pkgs/data/misc/adapta-backgrounds/default.nix +++ b/pkgs/data/misc/adapta-backgrounds/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "adapta-backgrounds-${version}"; - version = "0.5.2.3"; + pname = "adapta-backgrounds"; + version = "0.5.3.1"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-backgrounds"; rev = version; - sha256 = "0n0ggcxinja81lasmpviqq3l4jiwb05bs8r5aah1im2zvls1g007"; + sha256 = "04hmbmzf97rsii8gpwy3wkljy5xhxmlsl34d63s6hfy05knclydj"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ meson ninja pkgconfig glib ]; meta = with stdenv.lib; { description = "Wallpaper collection for adapta-project"; - homepage = https://github.com/adapta-project/adapta-backgrounds; + homepage = "https://github.com/adapta-project/adapta-backgrounds"; license = with licenses; [ gpl2 cc-by-sa-40 ]; platforms = platforms.all; - maintainers = [ maintainers.romildo ]; + maintainers = with maintainers; [ romildo ]; }; } -- cgit 1.4.1 From 021cbe0a06bb58dc00ba19f09a4fef61b3b2f2ab Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 5 Jul 2019 09:40:11 -0500 Subject: rubocop: 0.71.0 -> 0.72.0 --- pkgs/development/tools/rubocop/Gemfile.lock | 4 ++-- pkgs/development/tools/rubocop/gemset.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock index 314daff01c26..91fca663bf28 100644 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -2,12 +2,12 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.0) - jaro_winkler (1.5.2) + jaro_winkler (1.5.3) parallel (1.17.0) parser (2.6.3.0) ast (~> 2.4.0) rainbow (3.0.0) - rubocop (0.71.0) + rubocop (0.72.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix index 89428cdab0b9..1f83bbf96b78 100644 --- a/pkgs/development/tools/rubocop/gemset.nix +++ b/pkgs/development/tools/rubocop/gemset.nix @@ -14,10 +14,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l"; + sha256 = "1930v0chc1q4fr7hn0y1j34mw0v032a8kh0by4d4sbz8ksy056kf"; type = "gem"; }; - version = "1.5.2"; + version = "1.5.3"; }; parallel = { groups = ["default"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mjyrf1dmf58i40izs8rp2j4mqnyd4qpah9svmkwhs33ckxsjh6b"; + sha256 = "192vmm9ah6b4wyabawaszpr8n3z93y3ymykp3m4pncrbwngmn3m2"; type = "gem"; }; - version = "0.71.0"; + version = "0.72.0"; }; ruby-progressbar = { groups = ["default"]; -- cgit 1.4.1 From b198b3e33df03d2a186a9e05f5166a799cd4c15b Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sun, 7 Jul 2019 03:14:58 +0800 Subject: wireguard-tools: 0.0.20190601 -> 0.0.20190702 --- pkgs/tools/networking/wireguard-tools/default.nix | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index eef34c53f192..f918949a0277 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -1,14 +1,23 @@ -{ stdenv, fetchzip, openresolv ? null, libmnl ? null, procps ? null, iproute ? null, makeWrapper ? null, wireguard-go ? null }: +{ + stdenv, fetchzip, + + iproute ? null, + libmnl ? null, + makeWrapper ? null, + openresolv ? null, + procps ? null, + wireguard-go ? null, +}: with stdenv.lib; stdenv.mkDerivation rec { - name = "wireguard-tools-${version}"; - version = "0.0.20190601"; + pname = "wireguard-tools"; + version = "0.0.20190702"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0glcshf4dk2kfdkqc0x6ds45kpw6amsi8p2m81bfpmgnaglcbp7c"; + sha256 = "1xl4hzqrny3855s7h1k24py81gdjyfv0mhv6y528f6p0h38r89s3"; }; sourceRoot = "source/src/tools"; @@ -39,10 +48,10 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.sh; - meta = with stdenv.lib; { + meta = { description = "Tools for the WireGuard secure network tunnel"; - downloadPage = https://git.zx2c4.com/WireGuard/refs/; - homepage = https://www.wireguard.com/; + downloadPage = "https://git.zx2c4.com/WireGuard/refs/"; + homepage = "https://www.wireguard.com/"; license = licenses.gpl2; maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 ]; platforms = platforms.unix; -- cgit 1.4.1 From 7f32961ea227c53469e3361daecae499e0d96cab Mon Sep 17 00:00:00 2001 From: David Wood Date: Sun, 7 Jul 2019 12:23:01 +0100 Subject: nixos/jackett: add package option This allows users of the module to override the package to a newer version. Particularly useful as Jackett warns that old versions may not work. --- nixos/modules/services/misc/jackett.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix index a07f20e5c24b..f2dc6635df93 100644 --- a/nixos/modules/services/misc/jackett.nix +++ b/nixos/modules/services/misc/jackett.nix @@ -34,6 +34,13 @@ in default = "jackett"; description = "Group under which Jackett runs."; }; + + package = mkOption { + type = types.package; + default = pkgs.jackett; + defaultText = "pkgs.jackett"; + description = "Jackett package to use."; + }; }; }; @@ -51,7 +58,7 @@ in Type = "simple"; User = cfg.user; Group = cfg.group; - ExecStart = "${pkgs.jackett}/bin/Jackett --NoUpdates --DataFolder '${cfg.dataDir}'"; + ExecStart = "${cfg.package}/bin/Jackett --NoUpdates --DataFolder '${cfg.dataDir}'"; Restart = "on-failure"; }; }; -- cgit 1.4.1 From e2247dceb3c5ca896d2eda49eb91c548c1c3e91b Mon Sep 17 00:00:00 2001 From: David Wood Date: Sun, 7 Jul 2019 12:31:28 +0100 Subject: nixos/lidarr: re-add home attribute This was accidentally removed in a previous PR and broke things. --- nixos/modules/services/misc/lidarr.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/lidarr.nix b/nixos/modules/services/misc/lidarr.nix index 4c37bd74f150..40755c162171 100644 --- a/nixos/modules/services/misc/lidarr.nix +++ b/nixos/modules/services/misc/lidarr.nix @@ -68,6 +68,7 @@ in users.users = mkIf (cfg.user == "lidarr") { lidarr = { group = cfg.group; + home = "/var/lib/lidarr"; uid = config.ids.uids.lidarr; }; }; -- cgit 1.4.1 From 6c52a62472db5d59ce60785e49641f0f487a4203 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 7 Jul 2019 14:28:42 +0200 Subject: octoprint: remove sarge override Upstream wants 0.1.5post0 --- pkgs/applications/misc/octoprint/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 1eb1a1b93fb6..c0bacc2c50d2 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -15,7 +15,6 @@ let packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ (mkOverride "flask" "0.10.1" "0wrkavjdjndknhp8ya8j850jq7a1cli4g5a93mg8nh1xz2gq50sc") (mkOverride "flask_login" "0.2.11" "1rg3rsjs1gwi2pw6vr9jmhaqm9b3vc9c4hfcsvp4y8agbh7g3mc3") - (mkOverride "sarge" "0.1.4" "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar") (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") # Octoprint holds back jinja2 to 2.8.1 due to breaking changes. -- cgit 1.4.1 From 96b112910147edc7017a524d0e1a66557e89240c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 7 Jul 2019 14:33:06 +0200 Subject: octoprint-plugins.touchui: init at 0.3.13 --- pkgs/applications/misc/octoprint/plugins.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 1aca5164f6c8..8ab2f9f90cf6 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -123,6 +123,25 @@ let }; }; + touchui = buildPlugin rec { + pname = "TouchUI"; + version = "0.3.13"; + + src = fetchFromGitHub { + owner = "BillyBlaze"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "0qk12ysabdzy6cna3l4f8v3qcnppppwxxsjx2i0xn1nd0cv6yzwh"; + }; + + meta = with stdenv.lib; { + description = "Touch friendly interface for a small TFT module or phone for OctoPrint"; + homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; + }; in self -- cgit 1.4.1 From 21d2f1942c4e135570fd3ef56243d4eebc38b563 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 7 Jul 2019 14:38:01 +0200 Subject: octoprint-plugins.psucontrol: init at 0.1.8 --- pkgs/applications/misc/octoprint/plugins.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 8ab2f9f90cf6..0ff40963529e 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -142,6 +142,30 @@ let }; }; + psucontrol = buildPlugin rec { + pname = "PSUControl"; + version = "0.1.8"; + + src = fetchFromGitHub { + owner = "kantlivelong"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "0aj38d7b7d5pzmzq841pip18cpg18wy2vrxq2nd13875597y54b8"; + }; + + preConfigure = '' + # optional; RPi.GPIO is broken on vanilla kernels + sed /RPi.GPIO/d -i requirements.txt + ''; + + meta = with stdenv.lib; { + description = "OctoPrint plugin to control ATX/AUX power supply"; + homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; + }; in self -- cgit 1.4.1 From 707157e57f8dcd902ca77cb239e024ec8810460a Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 7 Jul 2019 14:45:20 +0200 Subject: marlin-calc: init at 2019-06-04 --- pkgs/tools/misc/marlin-calc/default.nix | 31 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/marlin-calc/default.nix diff --git a/pkgs/tools/misc/marlin-calc/default.nix b/pkgs/tools/misc/marlin-calc/default.nix new file mode 100644 index 000000000000..34b10a550f6b --- /dev/null +++ b/pkgs/tools/misc/marlin-calc/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "marlin-calc"; + version = "2019-06-04"; + + src = fetchFromGitHub { + owner = "eyal0"; + repo = "Marlin"; + rev = "4120d1c72d6c32e9c5cc745c05d20963ba4bbca3"; + sha256 = "06aly7s4k1r31njm43sbxq9a0127sw43pnaddh92a3cc39rbj2va"; + }; + + buildPhase = '' + cd Marlin/src + c++ module/planner.cpp module/calc.cpp feature/fwretract.cpp \ + -O2 -Wall -std=gnu++11 -o marlin-calc + ''; + + installPhase = '' + install -Dm0755 {,$out/bin/}marlin-calc + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/eyal0/Marlin"; + description = "Marlin 3D printer timing simulator"; + license = licenses.gpl3; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06dd28295702..a31a9f8ed22f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1699,6 +1699,8 @@ in lynis = callPackage ../tools/security/lynis { }; + marlin-calc = callPackage ../tools/misc/marlin-calc {}; + mathics = pythonPackages.mathics; masscan = callPackage ../tools/security/masscan { -- cgit 1.4.1 From 9d3de1b0dfe43acc907248fadb1dada650ef016b Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 7 Jul 2019 14:49:28 +0200 Subject: octoprint-plugins.printtimegenius: init at 1.3.1 --- pkgs/applications/misc/octoprint/plugins.nix | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 0ff40963529e..d8179e1b402a 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, octoprint, python2Packages }: +{ stdenv, fetchFromGitHub, octoprint, python2Packages, marlin-calc }: let buildPlugin = args: python2Packages.buildPythonPackage (args // { @@ -166,6 +166,31 @@ let }; }; + printtimegenius = buildPlugin rec { + pname = "PrintTimeGenius"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "eyal0"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "0ijv1nxmikv06a00hqqkqri6wnydqh6lwcx07pmvw6jy706jhy28"; + }; + + preConfigure = '' + # PrintTimeGenius ships with marlin-calc binaries for multiple architectures + rm */analyzers/marlin-calc* + sed 's@"{}.{}".format(binary_base_name, machine)@"${marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py + ''; + + meta = with stdenv.lib; { + description = "Better print time estimation for OctoPrint"; + homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; + }; in self -- cgit 1.4.1 From b86c2c54e521ab8eccb96873d6c62a93bddc80de Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Sun, 7 Jul 2019 08:32:00 -0500 Subject: emacs: Silence compiler warnings in site-start.el --- pkgs/applications/editors/emacs/site-start.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el index 34addc33a59c..de4708b88908 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -1,6 +1,7 @@ +;; -*- lexical-binding: t; -*- (defun nix--profile-paths () - "Returns a list of all paths in the NIX_PROFILES environment -variable, ordered from more-specific (the user profile) to the + "Return a list of all paths in NIX_PROFILES. +The list is ordered from more-specific (the user profile) to the least specific (the system profile)" (reverse (split-string (or (getenv "NIX_PROFILES") "")))) @@ -23,6 +24,7 @@ least specific (the system profile)" ;;; Make `woman' find the man pages +(defvar woman-manpath) (eval-after-load 'woman '(setq woman-manpath (append (mapcar (lambda (x) (concat x "/share/man/")) @@ -30,6 +32,7 @@ least specific (the system profile)" woman-manpath))) ;;; Make tramp work for remote NixOS machines +(defvar tramp-remote-path) (eval-after-load 'tramp-sh ;; TODO: We should also add the other `NIX_PROFILES' to this path. ;; However, these are user-specific, so we would need to discover @@ -42,6 +45,7 @@ least specific (the system profile)" ;;; the current file: ;;; from: /nix/store/-emacs-/share/emacs/site-lisp/site-start.el ;;; to: /nix/store/-emacs-/share/emacs//src/ +(defvar find-function-C-source-directory) (let ((emacs (file-name-directory ; .../emacs/ (directory-file-name ; .../emacs/site-lisp -- cgit 1.4.1 From f674ead30f6463effc288883e7f9f7aabde039a3 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 31 May 2019 18:57:24 +0200 Subject: mjpg-streamer: 2016-03-08 -> unstable-2019-05-24 --- pkgs/applications/video/mjpg-streamer/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix index f9d4d4698faf..70dc156d6802 100644 --- a/pkgs/applications/video/mjpg-streamer/default.nix +++ b/pkgs/applications/video/mjpg-streamer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mjpg-streamer-${version}"; - version = "2016-03-08"; + version = "unstable-2019-05-24"; src = fetchFromGitHub { owner = "jacksonliam"; repo = "mjpg-streamer"; - rev = "4060cb64e3557037fd404d10e1c1d076b672e9e8"; - sha256 = "0g7y832jsz4ylmq9qp2l4fq6bm8l6dhsbi60fr5jfqpx4l0pia8m"; + rev = "501f6362c5afddcfb41055f97ae484252c85c912"; + sha256 = "1cl159svfs1zzzrd3zgn4x7qy6751bvlnxfwf5hn5fmg4iszajw7"; }; prePatch = '' @@ -23,9 +23,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/mjpg-streamer/; + homepage = "https://github.com/jacksonliam/mjpg-streamer"; description = "MJPG-streamer takes JPGs from Linux-UVC compatible webcams, filesystem or other input plugins and streams them as M-JPEG via HTTP to webbrowsers, VLC and other software"; platforms = platforms.linux; license = licenses.gpl2; + maintainers = with maintainers; [ gebner ]; }; } -- cgit 1.4.1 From d6dfe401a5b914c12095803579c1c0a800f0ef06 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 21 Jun 2019 12:38:42 +0200 Subject: gotools: 2019-06-03 -> 2019-07-06 --- pkgs/development/tools/gotools/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 9bb57bfe5029..4051084c2103 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { name = "gotools-unstable-${version}"; - version = "2019-06-03"; - rev = "8aaa1484dc108aa23dcf2d4a09371c0c9e280f6b"; + version = "2019-07-06"; + rev = "72ffa07ba3db8d09f5215feec0f89464f3028f8e"; src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "0sa41fi38b6pvz7jjr6vqrd152qjvmbcagm1qdxw41vqcdw3ljx3"; + sha256 = "0c0s5aiwj807vxfzwrah32spwq8cnxvy0j117i5cbsqw2df80pgv"; }; - modSha256 = "0cm7fwb1k5hvbhh86kagzsw5vwgkr6dr7glhbjxg5xaahlhx2w5w"; + modSha256 = "16nkrpki9fnxsrxxxs9ljz49plcz393z0sqq2knkk30pmncpwd3q"; postConfigure = '' # Make the builtin tools available here -- cgit 1.4.1 From 447750e8e5bce3caf18922f752c0dc6164a907b9 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 5 Jul 2019 13:11:13 +0200 Subject: gotools: Remove gopls directory --- pkgs/development/tools/gotools/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 4051084c2103..d83f0ec40149 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -11,6 +11,16 @@ buildGoModule rec { sha256 = "0c0s5aiwj807vxfzwrah32spwq8cnxvy0j117i5cbsqw2df80pgv"; }; + # Build of golang.org/x/tools/gopls fails with: + # can't load package: package golang.org/x/tools/gopls: unknown import path "golang.org/x/tools/gopls": cannot find module providing package golang.org/x/tools/gopls + # That is most probably caused by golang.org/x/tools/gopls containing a separate Go module. + # In order to fix this, we simply remove the module. + # Note that build of golang.org/x/tools/cmd/gopls provides identical binary as golang.org/x/tools/gopls. + # See https://github.com/NixOS/nixpkgs/pull/64335. + postPatch = '' + rm -rf gopls + ''; + modSha256 = "16nkrpki9fnxsrxxxs9ljz49plcz393z0sqq2knkk30pmncpwd3q"; postConfigure = '' -- cgit 1.4.1 From 49283ed80255101786e7e97c680382c5f52ffde0 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 7 Jul 2019 16:55:08 +0100 Subject: cgit: add patch fixing remote DoS issue assigned MGASA-2019-0203 by mageia https://www.openwall.com/lists/oss-security/2019/05/19/3 --- .../version-management/git-and-tools/cgit/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index b3941809fb4c..6b25ef8518c9 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt +{ stdenv, fetchurl, fetchpatch, openssl, zlib, asciidoc, libxml2, libxslt , docbook_xsl, pkgconfig, luajit , coreutils, gnused, groff, docutils , gzip, bzip2, xz @@ -22,6 +22,14 @@ stdenv.mkDerivation rec { sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b"; }; + patches = [ + (fetchpatch { + name = "prevent-dos-limit-path-length.patch"; + url = "https://git.zx2c4.com/cgit/patch/?id=54c407a74a35d4ee9ffae94cc5bc9096c9f7f54a"; + sha256 = "1qlbpqsc293lmc9hzwf1j4jr5qlv8cm1r249v3yij5s4wki1595j"; + }) + ]; + nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit -- cgit 1.4.1 From a6426d5c05a70553f4f4ffd7026c268b111f690a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 7 Jul 2019 16:20:00 -0500 Subject: pythonPackages.nvchecker: 1.4.3 -> 1.4.4 --- pkgs/development/python-modules/nvchecker/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index 7ceffb7a8dd2..f21624acf143 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -1,19 +1,18 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytest, setuptools, structlog, pytest-asyncio, pytest_xdist, flaky, tornado, pycurl }: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytest, setuptools, structlog, pytest-asyncio, flaky, tornado, pycurl }: buildPythonPackage rec { pname = "nvchecker"; - version = "1.4.3"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "0v340wkq4sn9pvcpjh076l8mcqkn3nrn7if8p6iysk02bjxvknbv"; + sha256 = "6276ed2a897a30ccd71bfd7cf9e6b7842f37f3d5a86d7a70fe46f437c62b1875"; }; propagatedBuildInputs = [ setuptools structlog tornado pycurl ]; - checkInputs = [ pytest pytest-asyncio pytest_xdist flaky ]; + checkInputs = [ pytest pytest-asyncio flaky ]; - # Disable tests for now, because our version of pytest seems to be too new - # https://github.com/lilydjwg/nvchecker/commit/42a02efec84824a073601e1c2de30339d251e4c7 + # requires network access doCheck = false; checkPhase = '' -- cgit 1.4.1 From 566c8fde21c8026f1cf947b64b653656904f2c1e Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 6 Jul 2019 22:36:26 +0900 Subject: vimPlugins.coc-nvim: 0.0.71 -> 0.0.72 --- pkgs/misc/vim-plugins/overrides.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 0aa0fde972d5..1a4803fdcc57 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -111,10 +111,10 @@ self: super: { coc-nvim = let - version = "0.0.71"; + version = "0.0.72"; index_js = fetchzip { url = "https://github.com/neoclide/coc.nvim/releases/download/v${version}/coc.tar.gz"; - sha256 = "1bhkyrmrpriizg3f76x4vp94f2bfwcf7a6cp3jvv7vj4zaqhsjzz"; + sha256 = "128wlbnpz4gwpfnmzry5k52d58fyp9nccha314ndfnr9xgd6r52y"; }; in super.coc-nvim.overrideAttrs(old: { # you still need to enable the node js provider in your nvim config -- cgit 1.4.1 From 13a06115a1fc41699b256aed2c8f6c83fcb79ac7 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sun, 7 Jul 2019 22:59:58 +0800 Subject: dunst: 1.4.0 -> 1.4.1 --- pkgs/applications/misc/dunst/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 309d4d54ae5e..35073db2ae14 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ stdenv, lib, fetchFromGitHub, makeWrapper , pkgconfig, which, perl, libXrandr , cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver , libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false }: stdenv.mkDerivation rec { - name = "dunst-${version}"; - version = "1.4.0"; + pname = "dunst"; + version = "1.4.1"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "1rwbylygd88r61yrxc7ckg9svgq8b1i2falr0mk9sabqxzn9050s"; + sha256 = "0xjj1f2jr1ja5grj6wrx5jjz1sx5fpqnvkw7nqi4452j3nc4p4l2"; }; nativeBuildInputs = [ perl pkgconfig which systemd makeWrapper ]; @@ -33,19 +33,19 @@ stdenv.mkDerivation rec { buildFlags = if dunstify then [ "dunstify" ] else []; - postInstall = stdenv.lib.optionalString dunstify '' + postInstall = lib.optionalString dunstify '' install -Dm755 dunstify $out/bin '' + '' wrapProgram $out/bin/dunst \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight and customizable notification daemon"; - homepage = https://dunst-project.org/; + homepage = "https://dunst-project.org/"; license = licenses.bsd3; # NOTE: 'unix' or even 'all' COULD work too, I'm not sure platforms = platforms.linux; - maintainers = [ maintainers.domenkozar ]; + maintainers = with maintainers; [ domenkozar ]; }; } -- cgit 1.4.1 From 9719889377dd8b383e75fda19ef3008d7efa02e5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 7 Jul 2019 23:39:45 -0500 Subject: gitAndTools.git-gone: init at 0.1.2 --- .../version-management/git-and-tools/default.nix | 4 ++++ .../git-and-tools/git-gone/default.nix | 28 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-gone/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 58bd6a35f11d..5068647e8798 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -89,6 +89,10 @@ let git-extras = callPackage ./git-extras { }; + git-gone = callPackage ./git-gone { + inherit (darwin.apple_sdk.frameworks) Security; + }; + git-hub = callPackage ./git-hub { }; git-ignore = callPackage ./git-ignore { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix new file mode 100644 index 000000000000..d445e0181f43 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, curl, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "git-gone"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "lunaryorn"; + repo = pname; + rev = "v${version}"; + sha256 = "0vgkx227wpg9l2zza6446wzshjhnrhba3qhabibn4gg8wwcqmmxf"; + }; + + cargoSha256 = "11h2whlgjhg3j98a9w9k29njj89wx93w0dcyf981985flin709sx"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ curl libiconv Security ]; + + meta = with stdenv.lib; { + description = "Cleanup stale Git branches of pull requests"; + homepage = "https://github.com/lunaryorn/git-gone"; + license = licenses.asl20; + maintainers = [ maintainers.marsam ]; + platforms = platforms.unix; + }; +} -- cgit 1.4.1 From cddc1f1b6427672543c9c860c466c815a92fbba2 Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Sun, 30 Jun 2019 13:41:39 +0200 Subject: maintainers: add mpoquet --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8f3a692b6844..ce2efc2486f3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3462,6 +3462,11 @@ github = "mpickering"; name = "Matthew Pickering"; }; + mpoquet = { + email = "millian.poquet@gmail.com"; + github = "mpoquet"; + name = "Millian Poquet"; + }; mpscholten = { email = "marc@mpscholten.de"; github = "mpscholten"; -- cgit 1.4.1 From 0513ae77ff410dd7f59deae8ebbd03cc256ed8d6 Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Sun, 30 Jun 2019 13:42:54 +0200 Subject: simgrid: 3.22.2 -> 3.23 --- pkgs/applications/science/misc/simgrid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 554ef695a4ac..d6e3f05e0e13 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -18,14 +18,14 @@ in stdenv.mkDerivation rec { pname = "simgrid"; - version = "3.22.2"; + version = "3.23"; src = fetchFromGitLab { domain = "framagit.org"; owner = pname; repo = pname; rev = "v${version}"; - sha256 = "02zzivp3k7n2yvlr79p9kapzxpxq9x4x7jf2vrkpkwnssv4f9b4p"; + sha256 = "068xg5ps4j4v2sqqyl4vf83nfazp54gsy84gvlw52h94c4mj4xmp"; }; nativeBuildInputs = [ cmake perl python3 boost valgrind ] @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { ''; homepage = https://simgrid.org/; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ mickours ]; + maintainers = with maintainers; [ mickours mpoquet ]; platforms = ["x86_64-linux"]; }; } -- cgit 1.4.1 From f15d9d5123f9dfd97ac292ebc0643d0d7c4e7282 Mon Sep 17 00:00:00 2001 From: Charles Duffy Date: Sat, 6 Jul 2019 15:57:19 +0000 Subject: squashfsTools: Fix 4k-align patch (regression in 4.4dev) The 4k-align squashfs patch was broken in the update to squashfs 4.4dev, such that the patch was no longer actually applied in full (command line option not even parsed). --- pkgs/tools/filesystems/squashfs/default.nix | 2 +- .../squashfs/squashfs-tools-4.3-4k-align.patch | 93 ---------------------- .../squashfs/squashfs-tools-4.4-4k-align.patch | 87 ++++++++++++++++++++ 3 files changed, 88 insertions(+), 94 deletions(-) delete mode 100644 pkgs/tools/filesystems/squashfs/squashfs-tools-4.3-4k-align.patch create mode 100644 pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 2fd3d52bdf67..59a786116df6 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # This patch adds an option to pad filesystems (increasing size) in # exchange for better chunking / binary diff calculation. - ./squashfs-tools-4.3-4k-align.patch + ./squashfs-tools-4.4-4k-align.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch; buildInputs = [ zlib xz zstd ] diff --git a/pkgs/tools/filesystems/squashfs/squashfs-tools-4.3-4k-align.patch b/pkgs/tools/filesystems/squashfs/squashfs-tools-4.3-4k-align.patch deleted file mode 100644 index cd4308b489fe..000000000000 --- a/pkgs/tools/filesystems/squashfs/squashfs-tools-4.3-4k-align.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 7bda7c75748f36b0a50f93e46144d5a4de4974ad Mon Sep 17 00:00:00 2001 -From: Amin Hassani -Date: Thu, 15 Dec 2016 10:43:15 -0800 -Subject: [PATCH] mksquashfs 4K aligns the files inside the squashfs image - -Files inside a squashfs image are not necessarily 4k (4096) -aligned. This patch starts each file in a 4k aligned address and pads -zero to the end of the file until it reaches the next 4k aligned -address. This will not change the size of the compressed -blocks (especially the last one) and hence it will not change how the -files are being loaded in kernel or unsquashfs. However on average this -increases the size of the squashfs image which can be calculated by the -following formula: - -increased_size = (number_of_unfragmented_files_in_image + number of fragments) * 2048 - -The 4k alignment can be enabled by flag '-4k-align' ---- - squashfs-tools/mksquashfs.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index 8b1376f..683973d 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -99,6 +99,8 @@ int old_exclude = TRUE; - int use_regex = FALSE; - int nopad = FALSE; - int exit_on_error = FALSE; - static off_t squashfs_start_offset = 0; -+int do_4k_align = FALSE; -+#define ALIGN_UP(bytes, size) (bytes = (bytes + size - 1) & ~(size - 1)) - - long long global_uid = -1, global_gid = -1; - -@@ -1513,6 +1515,9 @@ void unlock_fragments() - * queue at this time. - */ - while(!queue_empty(locked_fragment)) { -+ // 4k align the start of remaining queued fragments. -+ if(do_4k_align) -+ ALIGN_UP(bytes, 4096); - write_buffer = queue_get(locked_fragment); - frg = write_buffer->block; - size = SQUASHFS_COMPRESSED_SIZE_BLOCK(fragment_table[frg].size); -@@ -2420,6 +2420,9 @@ - compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte); - write_buffer->size = compressed_size; - if(fragments_locked == FALSE) { -+ // 4k align the start of each fragment. -+ if(do_4k_align) -+ ALIGN_UP(bytes, 4096); - fragment_table[file_buffer->block].size = c_byte; - fragment_table[file_buffer->block].start_block = bytes; - write_buffer->block = bytes; -@@ -2761,6 +2769,10 @@ int write_file_blocks(squashfs_inode *inode, struct dir_ent *dir_ent, - long long sparse = 0; - struct file_buffer *fragment_buffer = NULL; - -+ // 4k align the start of each file. -+ if(do_4k_align) -+ ALIGN_UP(bytes, 4096); -+ - if(pre_duplicate(read_size)) - return write_file_blocks_dup(inode, dir_ent, read_buffer, dup); - -@@ -4692,6 +4704,7 @@ void write_filesystem_tables(struct squashfs_super_block *sBlk, int nopad) - "compressed", no_fragments ? "no" : noF ? "uncompressed" : - "compressed", no_xattrs ? "no" : noX ? "uncompressed" : - "compressed", noI || noId ? "uncompressed" : "compressed"); -+ printf("\t4k %saligned\n", do_4k_align ? "" : "un"); - printf("\tduplicates are %sremoved\n", duplicate_checking ? "" : - "not "); - printf("Filesystem size %.2f Kbytes (%.2f Mbytes)\n", bytes / 1024.0, -@@ -5346,6 +5359,8 @@ print_compressor_options: - root_name = argv[i]; - } else if(strcmp(argv[i], "-version") == 0) { - VERSION(); -+ } else if(strcmp(argv[i], "-4k-align") == 0) { -+ do_4k_align = TRUE; - } else { - ERROR("%s: invalid option\n\n", argv[0]); - printOptions: -@@ -5387,6 +5402,7 @@ printOptions: - ERROR("\t\t\tdirectory containing that directory, " - "rather than the\n"); - ERROR("\t\t\tcontents of the directory\n"); -+ ERROR("-4k-align\t\tenables 4k alignment of all files\n"); - ERROR("\nFilesystem filter options:\n"); - ERROR("-p \tAdd pseudo file " - "definition\n"); --- -2.14.1.480.gb18f417b89-goog (previously; hand-patched by charles-dyfis-net) diff --git a/pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch b/pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch new file mode 100644 index 000000000000..c9c3dd3d7604 --- /dev/null +++ b/pkgs/tools/filesystems/squashfs/squashfs-tools-4.4-4k-align.patch @@ -0,0 +1,87 @@ +From 7bda7c75748f36b0a50f93e46144d5a4de4974ad Mon Sep 17 00:00:00 2001 +From: Amin Hassani +Date: Thu, 15 Dec 2016 10:43:15 -0800 +Subject: [PATCH] mksquashfs 4K aligns the files inside the squashfs image + +Files inside a squashfs image are not necessarily 4k (4096) +aligned. This patch starts each file in a 4k aligned address and pads +zero to the end of the file until it reaches the next 4k aligned +address. This will not change the size of the compressed +blocks (especially the last one) and hence it will not change how the +files are being loaded in kernel or unsquashfs. However on average this +increases the size of the squashfs image which can be calculated by the +following formula: + +increased_size = (number_of_unfragmented_files_in_image + number of fragments) * 2048 + +The 4k alignment can be enabled by flag '-4k-align' +--- +diff -u a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +--- a/squashfs-tools/mksquashfs.c 2019-07-06 15:50:22.214873176 +0000 ++++ b/squashfs-tools/mksquashfs.c 2019-07-06 15:51:22.244802582 +0000 +@@ -100,7 +100,9 @@ + int use_regex = FALSE; + int nopad = FALSE; + int exit_on_error = FALSE; ++int do_4k_align = FALSE; + static off_t squashfs_start_offset = 0; ++#define ALIGN_UP(bytes, size) (bytes = (bytes + size - 1) & ~(size - 1)) + + long long global_uid = -1, global_gid = -1; + +@@ -1495,6 +1497,9 @@ + * queue at this time. + */ + while(!queue_empty(locked_fragment)) { ++ // 4k align the start of remaining queued fragments. ++ if(do_4k_align) ++ ALIGN_UP(bytes, 4096); + write_buffer = queue_get(locked_fragment); + frg = write_buffer->block; + size = SQUASHFS_COMPRESSED_SIZE_BLOCK(fragment_table[frg].size); +@@ -2414,6 +2419,9 @@ + compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte); + write_buffer->size = compressed_size; + if(fragments_locked == FALSE) { ++ // 4k align the start of each fragment. ++ if(do_4k_align) ++ ALIGN_UP(bytes, 4096); + fragment_table[file_buffer->block].size = c_byte; + fragment_table[file_buffer->block].start_block = bytes; + write_buffer->block = bytes; +@@ -2728,6 +2736,10 @@ + long long sparse = 0; + struct file_buffer *fragment_buffer = NULL; + ++ // 4k align the start of each file. ++ if(do_4k_align) ++ ALIGN_UP(bytes, 4096); ++ + if(pre_duplicate(read_size)) + return write_file_blocks_dup(inode, dir_ent, read_buffer, dup); + +@@ -4808,6 +4820,7 @@ + "compressed", no_fragments ? "no" : noF ? "uncompressed" : + "compressed", no_xattrs ? "no" : noX ? "uncompressed" : + "compressed", noI || noId ? "uncompressed" : "compressed"); ++ printf("\t4k %saligned\n", do_4k_align ? "" : "un"); + printf("\tduplicates are %sremoved\n", duplicate_checking ? "" : + "not "); + printf("Filesystem size %.2f Kbytes (%.2f Mbytes)\n", bytes / 1024.0, +@@ -5570,6 +5583,8 @@ + root_name = argv[i]; + } else if(strcmp(argv[i], "-version") == 0) { + VERSION(); ++ } else if(strcmp(argv[i], "-4k-align") == 0) { ++ do_4k_align = TRUE; + } else { + ERROR("%s: invalid option\n\n", argv[0]); + printOptions: +@@ -5613,6 +5628,7 @@ + ERROR("\t\t\tdirectory containing that directory, " + "rather than the\n"); + ERROR("\t\t\tcontents of the directory\n"); ++ ERROR("-4k-align\t\tenables 4k alignment of all files\n"); + ERROR("\nFilesystem filter options:\n"); + ERROR("-p \tAdd pseudo file " + "definition\n"); -- cgit 1.4.1 From 3df683c8ca2fce5953749925248da6564e7ea809 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Jul 2019 07:45:27 -0400 Subject: linux: Add 5.2 Update linuxPackages_latest to 5.2 --- pkgs/os-specific/linux/kernel/linux-5.2.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 11 ++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-5.2.nix diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix new file mode 100644 index 000000000000..094c5abf2442 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "5.2"; + + # 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; + + # branchVersion needs to be x.y + extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "1ry11b5sc20jh7flnp94m20627jzl3l09rzmfjsk3a71fbv6dbal"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5465bb02a9b7..3943d02499cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15360,6 +15360,14 @@ in ]; }; + linux_5_2 = callPackage ../os-specific/linux/kernel/linux-5.2.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.modinst_arg_list_too_long + kernelPatches.export_kernel_fpu_functions + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -15551,7 +15559,7 @@ in linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_5_1; + linuxPackages_latest = linuxPackages_5_2; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -15562,6 +15570,7 @@ in linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_1); + linuxPackages_5_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_2); # When adding to this list: # - Update linuxPackages_latest to the latest version -- cgit 1.4.1 From 5aa497fcd6ec23cc108b944bcf2c641c591778d2 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Mon, 8 Jul 2019 12:50:40 +0000 Subject: clightning: 0.7.0 -> 0.7.1 --- pkgs/applications/altcoins/clightning.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/altcoins/clightning.nix index 5f81dc76ecf2..481e19c66cdc 100644 --- a/pkgs/applications/altcoins/clightning.nix +++ b/pkgs/applications/altcoins/clightning.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "clightning-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "448022c2433cbf19bbd0f726344b0500c0c21ee5cc2291edf6b622f094cb3a15"; + sha256 = "557be34410f27a8d55d9f31a40717a8f5e99829f2bd114c24e7ca1dd5f6b7d85"; }; enableParallelBuilding = true; @@ -18,15 +18,6 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out) VERSION=v${version}" ]; - patches = [ - # remove after 0.7.0 - (fetchpatch { - name = "fix-0.7.0-build.patch"; - url = "https://github.com/ElementsProject/lightning/commit/ffc03d2bc84dc42f745959fbb6c8007cf0a6f701.patch"; - sha256 = "1m5fiz3m8k3nk09nldii8ij94bg6fqllqgdbiwj3sy12vihs8c4v"; - }) - ]; - configurePhase = '' ./configure --prefix=$out --disable-developer --disable-valgrind ''; -- cgit 1.4.1 From 3f598c0faaf2d0e113654d69809f93a8fd729bec Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 27 Jun 2019 18:10:41 +0200 Subject: nixos/loki: add module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/monitoring/loki.nix | 112 +++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 nixos/modules/services/monitoring/loki.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c4ee28a95930..1d1995eda25a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -492,6 +492,7 @@ ./services/monitoring/heapster.nix ./services/monitoring/incron.nix ./services/monitoring/kapacitor.nix + ./services/monitoring/loki.nix ./services/monitoring/longview.nix ./services/monitoring/monit.nix ./services/monitoring/munin.nix diff --git a/nixos/modules/services/monitoring/loki.nix b/nixos/modules/services/monitoring/loki.nix new file mode 100644 index 000000000000..4d11360d07e9 --- /dev/null +++ b/nixos/modules/services/monitoring/loki.nix @@ -0,0 +1,112 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) escapeShellArgs literalExample mkEnableOption mkIf mkOption types; + + cfg = config.services.loki; + + prettyJSON = conf: + pkgs.runCommand "loki-config.json" { } '' + echo '${builtins.toJSON conf}' | ${pkgs.jq}/bin/jq 'del(._module)' > $out + ''; + +in { + options.services.loki = { + enable = mkEnableOption "loki"; + + user = mkOption { + type = types.str; + default = "loki"; + description = '' + User under which the Loki service runs. + ''; + }; + + group = mkOption { + type = types.str; + default = "loki"; + description = '' + Group under which the Loki service runs. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/loki"; + description = '' + Specify the directory for Loki. + ''; + }; + + configuration = mkOption { + type = types.attrs; + default = {}; + description = '' + Specify the configuration for Loki in Nix. + ''; + }; + + configFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Specify a configuration file that Loki should use. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + example = literalExample [ "--server.http-listen-port=3101" ]; + description = '' + Specify a list of additional command line flags, + which get escaped and are then passed to Loki. + ''; + }; + }; + + config = mkIf cfg.enable { + assertions = [{ + assertion = ( + (cfg.configuration == {} -> cfg.configFile != null) && + (cfg.configFile != null -> cfg.configuration == {}) + ); + message = '' + Please specify either + 'services.loki.configuration' or + 'services.loki.configFile'. + ''; + }]; + + users.groups.${cfg.group} = { }; + users.users.${cfg.user} = { + description = "Loki Service User"; + group = cfg.group; + home = cfg.dataDir; + createHome = true; + isSystemUser = true; + }; + + systemd.services.loki = { + description = "Loki Service Daemon"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = let + conf = if cfg.configFile == null + then prettyJSON cfg.configuration + else cfg.configFile; + in + { + ExecStart = "${pkgs.grafana-loki}/bin/loki --config.file=${conf} ${escapeShellArgs cfg.extraFlags}"; + User = cfg.user; + Restart = "always"; + PrivateTmp = true; + ProtectHome = true; + ProtectSystem = "full"; + DecvicePolicy = "closed"; + NoNewPrivileges = true; + WorkingDirectory = cfg.dataDir; + }; + }; + }; +} -- cgit 1.4.1 From d90242029047942bd159242417f2fda03c795582 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 27 Jun 2019 18:11:09 +0200 Subject: nixos/tests: add test for loki --- nixos/tests/all-tests.nix | 1 + nixos/tests/loki.nix | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 nixos/tests/loki.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 359f62751b99..2f527bfa090d 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -139,6 +139,7 @@ in #lightdm = handleTest ./lightdm.nix {}; limesurvey = handleTest ./limesurvey.nix {}; login = handleTest ./login.nix {}; + loki = handleTest ./loki.nix {}; #logstash = handleTest ./logstash.nix {}; mailcatcher = handleTest ./mailcatcher.nix {}; mathics = handleTest ./mathics.nix {}; diff --git a/nixos/tests/loki.nix b/nixos/tests/loki.nix new file mode 100644 index 000000000000..9c3058d02f84 --- /dev/null +++ b/nixos/tests/loki.nix @@ -0,0 +1,37 @@ +import ./make-test.nix ({ lib, pkgs, ... }: + +{ + name = "loki"; + + meta = with lib.maintainers; { + maintainers = [ willibutz ]; + }; + + machine = { ... }: { + services.loki = { + enable = true; + configFile = "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml"; + }; + systemd.services.promtail = { + description = "Promtail service for Loki test"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = '' + ${pkgs.grafana-loki}/bin/promtail --config.file ${pkgs.grafana-loki.src}/cmd/promtail/promtail-local-config.yaml + ''; + DynamicUser = true; + }; + }; + }; + + testScript = '' + $machine->start; + $machine->waitForUnit("loki.service"); + $machine->waitForUnit("promtail.service"); + $machine->waitForOpenPort(3100); + $machine->waitForOpenPort(9080); + $machine->succeed("echo 'Loki Ingestion Test' > /var/log/testlog"); + $machine->waitUntilSucceeds("${pkgs.grafana-loki}/bin/logcli --addr='http://localhost:3100' query --no-labels '{job=\"varlogs\",filename=\"/var/log/testlog\"}' | grep -q 'Loki Ingestion Test'"); + ''; +}) -- cgit 1.4.1 From f5665832ecc7846e00aa699b3d0a167c73db27d9 Mon Sep 17 00:00:00 2001 From: Michael Reilly Date: Sun, 7 Jul 2019 22:26:06 -0400 Subject: python37Packages.opencv: remove As far as I can tell after a few days of searching, OpenCV's version 2 does not at all support Python version 3, and other distributions of Python bindings for OpenCV v2.4.x that I could find do not support Python3 for this version series. --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ec132264a99..eaee38ceaeb4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1647,10 +1647,10 @@ in { openant = callPackage ../development/python-modules/openant { }; - opencv = toPythonModule (pkgs.opencv.override { + opencv = disabledIf isPy3k (toPythonModule (pkgs.opencv.override { enablePython = true; pythonPackages = self; - }); + })); opencv3 = toPythonModule (pkgs.opencv3.override { enablePython = true; -- cgit 1.4.1 From 6a41fca56adcd8ca630254d3ec206ec0cc4f59f4 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Mon, 8 Jul 2019 22:22:13 +0800 Subject: rofi: 1.5.3 -> 1.5.4 Update URL of source code, because the Git repository was moved to "https://github.com/davatorium/rofi" from "https://github.com/DaveDavenport/rofi". --- pkgs/applications/misc/rofi/default.nix | 16 +++++++++------- pkgs/applications/misc/rofi/wrapper.nix | 4 +++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 0cf297b1b5d9..94381d4f6f96 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git +{ stdenv, lib, fetchurl +, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git , cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification , bison, flex, librsvg, check }: stdenv.mkDerivation rec { - version = "1.5.3"; - name = "rofi-unwrapped-${version}"; + pname = "rofi-unwrapped"; + version = "1.5.4"; src = fetchurl { - url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/rofi-${version}.tar.gz"; - sha256 = "1mskknfnpgmaghplwcyc44qc8swb1f9qiyi67fz9i77jijjpj1lx"; + url = "https://github.com/davatorium/rofi/releases/download/${version}/rofi-${version}.tar.gz"; + sha256 = "1g1170zmh5v7slnm1sm2d08jgz6icikf8rm17apm1bjzzyw1lhk7"; }; preConfigure = '' @@ -22,11 +23,12 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which ]; + doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Window switcher, run dialog and dmenu replacement"; - homepage = https://github.com/davatorium/rofi; + homepage = "https://github.com/davatorium/rofi"; license = licenses.mit; maintainers = with maintainers; [ mbakke ma27 ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix index c2384f56faa1..8c24d27f0752 100644 --- a/pkgs/applications/misc/rofi/wrapper.nix +++ b/pkgs/applications/misc/rofi/wrapper.nix @@ -2,7 +2,9 @@ if theme == null then rofi-unwrapped else stdenv.mkDerivation { - name = "rofi-${rofi-unwrapped.version}"; + pname = "rofi"; + version = rofi-unwrapped.version; + buildInputs = [ makeWrapper ]; preferLocalBuild = true; passthru.unwrapped = rofi-unwrapped; -- cgit 1.4.1 From 00ba557856d6217121e50ea69c251e9458d9dc08 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 8 Jul 2019 12:31:11 -0400 Subject: systems/doubles.nix: add Apple doubles These are used in cross-compilation to iOS devices and simulators. Fallout from #60349. --- lib/systems/doubles.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 09e9089aa6fd..39018d045b32 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -13,9 +13,11 @@ let "i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd" - "x86_64-cygwin" "x86_64-darwin" "x86_64-freebsd" "x86_64-linux" + "x86_64-cygwin" "x86_64-freebsd" "x86_64-linux" "x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris" + "x86_64-darwin" "aarch64-ios" "armv7a-ios" "x86_64-ios" "i686-ios" + "x86_64-windows" "i686-windows" "wasm64-wasi" "wasm32-wasi" -- cgit 1.4.1 From ddc8398e7f1693235cf6fd538f5b836b7415d85a Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 18 Jun 2019 10:13:23 +0200 Subject: conda: Add LIBARCHIVE `conda-build` needs to be able to find libarchive to extract packages; it tries to `dlopen` the library given by `LIBARCHIVE`. --- pkgs/tools/package-management/conda/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/tools/package-management/conda/default.nix index 5ddcee6d1d33..71dd78618081 100644 --- a/pkgs/tools/package-management/conda/default.nix +++ b/pkgs/tools/package-management/conda/default.nix @@ -5,6 +5,7 @@ , makeWrapper , buildFHSUserEnv , libselinux +, libarchive , xorg # Conda installs its packages and environments under this directory , installationPath ? "~/.conda" @@ -59,6 +60,7 @@ in # Some other required environment variables export FONTCONFIG_FILE=/etc/fonts/fonts.conf export QTCOMPOSE=${xorg.libX11}/share/X11/locale + export LIBARCHIVE=${libarchive.lib}/lib/libarchive.so ''; meta = { -- cgit 1.4.1 From 13b815603077abd0bcfcf412f9fbb28df2320ff3 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 7 Jul 2019 23:39:44 +0300 Subject: kvmgt service: use modprobe, force-load module --- nixos/modules/virtualisation/kvmgt.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/kvmgt.nix b/nixos/modules/virtualisation/kvmgt.nix index bfcf51d09c45..289e26e17035 100644 --- a/nixos/modules/virtualisation/kvmgt.nix +++ b/nixos/modules/virtualisation/kvmgt.nix @@ -4,13 +4,16 @@ with lib; let cfg = config.virtualisation.kvmgt; + kernelPackages = config.boot.kernelPackages; + vgpuOptions = { uuid = mkOption { type = types.string; description = "UUID of VGPU device. You can generate one with libossp_uuid."; }; }; + in { options = { virtualisation.kvmgt = { @@ -45,7 +48,13 @@ in { assertion = versionAtLeast kernelPackages.kernel.version "4.16"; message = "KVMGT is not properly supported for kernels older than 4.16"; }; - boot.kernelParams = [ "i915.enable_gvt=1" ]; + + boot.kernelModules = [ "kvmgt" ]; + + boot.extraModprobeConfig = '' + options i915 enable_gvt=1 + ''; + systemd.paths = mapAttrs' (name: value: nameValuePair "kvmgt-${name}" { description = "KVMGT VGPU ${name} path"; @@ -55,6 +64,7 @@ in { }; } ) cfg.vgpus; + systemd.services = mapAttrs' (name: value: nameValuePair "kvmgt-${name}" { description = "KVMGT VGPU ${name}"; -- cgit 1.4.1 From ed27ba064ca6f8c7837a6dec2d2af424092485be Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 8 Jul 2019 21:48:19 +0200 Subject: cmake: update ApplicationServices patch --- .../tools/build-managers/cmake/application-services.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/tools/build-managers/cmake/application-services.patch b/pkgs/development/tools/build-managers/cmake/application-services.patch index 2107dcdfbc66..0373ca2d67cd 100644 --- a/pkgs/development/tools/build-managers/cmake/application-services.patch +++ b/pkgs/development/tools/build-managers/cmake/application-services.patch @@ -47,3 +47,14 @@ index d7af6e2..d4808fc 100644 add_subdirectory(libarchive) install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibarchive) +index e505bdd..f45557d 100644 +--- a/Utilities/cmlibuv/src/unix/darwin-proctitle.c ++++ b/Utilities/cmlibuv/src/unix/darwin-proctitle.c +@@ -30,7 +30,6 @@ + + #if !TARGET_OS_IPHONE + # include +-# include + #endif + + #define S(s) pCFStringCreateWithCString(NULL, (s), kCFStringEncodingUTF8) -- cgit 1.4.1 From 06d8666a60174dd3083d1516f9f405251601f476 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 25 Jun 2019 22:17:21 +0200 Subject: firefox: allow overriding config of wrapped package By moving the `cfg` variable into the wrapper arguments we are able to override it for an already wrapped package. For example, with this change one can have pkgs.firefox-devedition-bin.override { cfg.enableBrowserpass = true; } which would otherwise be difficult to accomplish for packages having a complicated wrapped definition in `all-packages.nix`. --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index d99c2a40b081..bc1678335947 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -28,12 +28,12 @@ let , extraPlugins ? [] , extraNativeMessagingHosts ? [] , gdkWayland ? false + , cfg ? config.${browserName} or {} }: assert gdkWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used let - cfg = config.${browserName} or {}; enableAdobeFlash = cfg.enableAdobeFlash or false; ffmpegSupport = browser.ffmpegSupport or false; gssSupport = browser.gssSupport or false; -- cgit 1.4.1 From a6fe0a075e40aea99aa3d25093f7e01753395141 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 9 Jul 2019 07:03:22 +0800 Subject: eksctl: 0.1.38 -> 0.1.39 (#64444) --- pkgs/tools/admin/eksctl/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 1370049d42bc..bb4c89dd4dc4 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -1,33 +1,32 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "eksctl"; - version = "0.1.38"; + version = "0.1.39"; src = fetchFromGitHub { owner = "weaveworks"; repo = "eksctl"; rev = version; - sha256 = "1nhsy4d1a1vh7g2ibcxnzgxnldfyh51hiq4v4vy123487b6ndqd0"; + sha256 = "11y2pb5jn64v89a9hwi25rakrnsvhyjyr8kdrjk81d6hhrfkz3g0"; }; - goPackagePath = "github.com/weaveworks/eksctl"; + modSha256 = "1lmkwx0r19c2wg9nm85k92nlxjzr8q917jf3f333yf3csfyiix2f"; subPackages = [ "cmd/eksctl" ]; buildFlags = '' - -ldflags=-s - -ldflags=-w -tags netgo -tags release ''; postInstall = '' - mkdir -p "$bin/share/"{bash-completion/completions,zsh/site-functions} - $bin/bin/eksctl completion bash > "$bin/share/bash-completion/completions/eksctl" - $bin/bin/eksctl completion zsh > "$bin/share/zsh/site-functions/_eksctl" + mkdir -p "$out/share/"{bash-completion/completions,zsh/site-functions} + + $out/bin/eksctl completion bash > "$out/share/bash-completion/completions/eksctl" + $out/bin/eksctl completion zsh > "$out/share/zsh/site-functions/_eksctl" ''; meta = with lib; { -- cgit 1.4.1 From ca13e2b5e3a166613455254b894fe44de4021149 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 7 Jul 2019 21:11:07 -0400 Subject: vscode-extensions.ms-vscode.cpptools: 0.23.1 -> 0.24.0 --- pkgs/misc/vscode-extensions/cpptools/default.nix | 47 +++++++++++++++--------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index 37e5759c8584..a60dad9b7b70 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchzip, vscode-utils, jq, mono, clang-tools, writeScript, runtimeShell +{ stdenv, vscode-utils +, fetchurl, unzip +, mono, writeScript, runtimeShell +, jq, clang-tools , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. }: @@ -30,25 +33,37 @@ assert gdbUseFixed -> null != gdb; let gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb"; - langComponentBinaries = stdenv.mkDerivation { + langComponentBinaries = stdenv.mkDerivation rec { name = "cpptools-language-component-binaries"; - src = fetchzip { + src = fetchurl { # Follow https://go.microsoft.com/fwlink/?linkid=2037608 - url = "https://download.visualstudio.microsoft.com/download/pr/97ed3eeb-b31e-421c-92dc-4f3a98af301e/069a1e6ab1b4b017853a7e9e08067744/bin_linux.zip"; - sha256 = "19flm4vcrg89x0b20bd0g45apabzfqgvcpjddnmyk312jc242gmb"; + url = "https://download.visualstudio.microsoft.com/download/pr/fd05d7fd-b771-4746-9c54-b5b30afcd82e/1f443716d6156a265bf50cb6e53fa999/bin_linux.zip"; + sha256 = "198xnq709clibjmd8rrv0haniy2m3qvhn89hg9hpj6lvg9lsr7a4"; }; - patchPhase = '' - elfInterpreter="${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2" - patchelf --set-interpreter "$elfInterpreter" ./Microsoft.VSCode.CPP.Extension.linux - patchelf --set-interpreter "$elfInterpreter" ./Microsoft.VSCode.CPP.IntelliSense.Msvc.linux - chmod a+x ./Microsoft.VSCode.CPP.Extension.linux ./Microsoft.VSCode.CPP.IntelliSense.Msvc.linux + sourceRoot = name; + + nativeBuildInputs = [ unzip ]; + + unpackPhase = '' + runHook preUnpack + unzip -d $name $src || true + runHook postUnpack ''; installPhase = '' + runHook preInstall mkdir -p "$out/bin" - find . -mindepth 1 -maxdepth 1 | xargs cp -a -t "$out/bin" + cp -a -t "$out/bin" ./bin/* + runHook postInstall + ''; + + postFixup = '' + elfInterpreter="$(cat $NIX_CC/nix-support/dynamic-linker)" + patchelf --set-interpreter "$elfInterpreter" $out/bin/Microsoft.VSCode.CPP.Extension.linux + patchelf --set-interpreter "$elfInterpreter" $out/bin/Microsoft.VSCode.CPP.IntelliSense.Msvc.linux + chmod a+x $out/bin/Microsoft.VSCode.CPP.Extension.linux $out/bin/Microsoft.VSCode.CPP.IntelliSense.Msvc.linux ''; }; @@ -68,8 +83,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.23.1"; - sha256 = "08kfzvyl8vgjmhqzpp7pxw0gd87jr5g7z15ag4cpcil4inq4c8k3"; + version = "0.24.0"; + sha256 = "0b0rwj3aadd4kf561zpzv95r96dqvhkn7db8d7rz3naaqydz0z8i"; }; buildInputs = [ @@ -80,16 +95,12 @@ vscode-utils.buildVscodeMarketplaceExtension { mv ./package.json ./package_ori.json # 1. Add activation events so that the extension is functional. This listing is empty when unpacking the extension but is filled at runtime. - # 2. Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. + # 2. Patch `package.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. cat ./package_ori.json | \ jq --slurpfile actEvts ${./package-activation-events.json} '(.activationEvents) = $actEvts[0]' | \ jq '(.contributes.debuggers[].configurationAttributes | .attach , .launch | .properties.miDebuggerPath | select(. != null) | select(.default == "/usr/bin/gdb") | .default) = "${gdbDefaultsTo}"' > \ ./package.json - # Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. - substituteInPlace "./package.json" \ - --replace "\"default\": \"/usr/bin/gdb\"" "\"default\": \"${gdbDefaultsTo}\"" - # Prevent download/install of extensions touch "./install.lock" -- cgit 1.4.1 From 87bc26169b19b6c1bccfeefe41dfe221511bff66 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Mon, 8 Jul 2019 17:39:43 +0800 Subject: opera: 60.0.3255.170 -> 62.0.3331.43 --- .../networking/browsers/opera/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 215bf07d4d52..732e020604a8 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -13,6 +13,7 @@ , glib , gnome2 , gtk3 +, lib , libX11 , libxcb , libXScrnSaver @@ -39,10 +40,9 @@ let - mirror = https://get.geo.opera.com/pub/opera/desktop; - version = "60.0.3255.170"; + mirror = "https://get.geo.opera.com/pub/opera/desktop"; - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ # These provide shared libraries loaded when starting. If one is missing, # an error is shown in stderr. @@ -90,13 +90,14 @@ let at-spi2-core ]; -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { - name = "opera-${version}"; + pname = "opera"; + version = "62.0.3331.43"; src = fetchurl { - url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; - sha256 = "04bcy9qhrhps3712k229yn58ak2j93wcp613zd6l2zxb8a286991"; + url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; + sha256 = "0zylg32zn6blkgy4bwmjzc26i712lwakahvrd24ncpfa8805f7x7"; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; @@ -118,10 +119,10 @@ in stdenv.mkDerivation { done ''; - meta = { - homepage = https://www.opera.com; + meta = with lib; { + homepage = "https://www.opera.com"; description = "Web browser"; platforms = [ "x86_64-linux" ]; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; }; } -- cgit 1.4.1 From d82840dbd183d682528357a234fb19759489fdf3 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 27 Jun 2019 18:50:27 -0400 Subject: nixos/release-notes: fix bad merge of cargo-vendor entry and overall indentation --- nixos/doc/manual/release-notes/rl-1909.xml | 178 +++++++++++++++-------------- 1 file changed, 91 insertions(+), 87 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index eae84ee1a192..8a65642270cc 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -81,45 +81,45 @@ - The options and - have been removed - because the alertmanager service is now using systemd's - DynamicUser mechanism which obviates these options. + The options and + have been removed + because the alertmanager service is now using systemd's + DynamicUser mechanism which obviates these options. - The NetworkManager systemd unit was renamed back from network-manager.service to - NetworkManager.service for better compatibility with other applications expecting this name. - The same applies to ModemManager where modem-manager.service is now called ModemManager.service again. + The NetworkManager systemd unit was renamed back from network-manager.service to + NetworkManager.service for better compatibility with other applications expecting this name. + The same applies to ModemManager where modem-manager.service is now called ModemManager.service again. - The and - options were removed as they are managed internally by the nzbget. The - option hadn't actually been used by - the module for some time and so was removed as cleanup. + The and + options were removed as they are managed internally by the nzbget. The + option hadn't actually been used by + the module for some time and so was removed as cleanup. - The option was removed, as it was only used by the wordpress - apache-httpd service to wait for mysql to have started up. - This can be accomplished by either describing a dependency on mysql.service (preferred) - or waiting for the (hardcoded) /run/mysqld/mysql.sock file to appear. + The option was removed, as it was only used by the wordpress + apache-httpd service to wait for mysql to have started up. + This can be accomplished by either describing a dependency on mysql.service (preferred) + or waiting for the (hardcoded) /run/mysqld/mysql.sock file to appear. - The module has been removed, see - instead for a free software fork of Emby. + The module has been removed, see + instead for a free software fork of Emby. - See the Jellyfin documentation: - - Migrating from Emby to Jellyfin - + See the Jellyfin documentation: + + Migrating from Emby to Jellyfin + @@ -136,50 +136,50 @@ - Several of the apache subservices have been replaced with full NixOS - modules including LimeSurvey and WordPress. - These modules can be enabled using the - and options. + Several of the apache subservices have been replaced with full NixOS + modules including LimeSurvey and WordPress. + These modules can be enabled using the + and options. - - The option - was renamed to - (capital L). This follows - - upstreams renaming - of the setting. - + + The option + was renamed to + (capital L). This follows + + upstreams renaming + of the setting. + - As of this release the NixOps feature autoLuks is deprecated. It no longer works - with our systemd version without manual intervention. + As of this release the NixOps feature autoLuks is deprecated. It no longer works + with our systemd version without manual intervention. - Whenever the usage of the module is detected the evaluation will fail with a message - explaining why and how to deal with the situation. + Whenever the usage of the module is detected the evaluation will fail with a message + explaining why and how to deal with the situation. - A new knob named nixops.enableDeprecatedAutoLuks - has been introduced to disable the eval failure and to acknowledge the notice was received and read. - If you plan on using the feature please note that it might break with subsequent updates. + A new knob named nixops.enableDeprecatedAutoLuks + has been introduced to disable the eval failure and to acknowledge the notice was received and read. + If you plan on using the feature please note that it might break with subsequent updates. - Make sure you set the _netdev option for each of the file systems referring to block - devices provided by the autoLuks module. Not doing this might render the system in a - state where it doesn't boot anymore. + Make sure you set the _netdev option for each of the file systems referring to block + devices provided by the autoLuks module. Not doing this might render the system in a + state where it doesn't boot anymore. - If you are actively using the autoLuks module please let us know in - issue #62211. + If you are actively using the autoLuks module please let us know in + issue #62211. - - + + - The setopt declarations will be evaluated at the end of /etc/zshrc, so any code in , - and may break if it relies on those options being set. + The setopt declarations will be evaluated at the end of /etc/zshrc, so any code in , + and may break if it relies on those options being set. @@ -236,36 +236,36 @@ - The hunspellDicts.fr-any dictionary now ships with fr_FR.{aff,dic} - which is linked to fr-toutesvariantes.{aff,dic}. + The hunspellDicts.fr-any dictionary now ships with fr_FR.{aff,dic} + which is linked to fr-toutesvariantes.{aff,dic}. - - + + - The mysql service now runs as mysql - user. Previously, systemd did execute it as root, and mysql dropped privileges - itself. - This includes ExecStartPre= and - ExecStartPost= phases. - To accomplish that, runtime and data directory setup was delegated to - RuntimeDirectory and tmpfiles. + The mysql service now runs as mysql + user. Previously, systemd did execute it as root, and mysql dropped privileges + itself. + This includes ExecStartPre= and + ExecStartPost= phases. + To accomplish that, runtime and data directory setup was delegated to + RuntimeDirectory and tmpfiles. - With the upgrade to systemd version 242 the systemd-timesyncd - service is no longer using DynamicUser=yes. In order for the - upgrade to work we rely on an activation script to move the state from the old - to the new directory. The older directory (prior 19.09) was - /var/lib/private/systemd/timesync. + With the upgrade to systemd version 242 the systemd-timesyncd + service is no longer using DynamicUser=yes. In order for the + upgrade to work we rely on an activation script to move the state from the old + to the new directory. The older directory (prior 19.09) was + /var/lib/private/systemd/timesync. - As long as the system.config.stateVersion is below - 19.09 the state folder will migrated to its proper location - (/var/lib/systemd/timesync), if required. + As long as the system.config.stateVersion is below + 19.09 the state folder will migrated to its proper location + (/var/lib/systemd/timesync), if required. - - + + The package avahi is now built to look up service definitions from /etc/avahi/services instead of its @@ -275,32 +275,36 @@ in the aforementioned directory. See avahi.service5 for more information on custom service definitions. - Since version 0.1.19, cargo-vendor honors package - includes that are specified in the Cargo.toml - file of Rust crates. rustPlatform.buildRustPackage uses - cargo-vendor to collect and build dependent crates. - Since this change in cargo-vendor changes the set of - vendored files for most Rust packages, the hash that use used to verify - the dependencies, cargoSha256, also changes. + + + + + Since version 0.1.19, cargo-vendor honors package + includes that are specified in the Cargo.toml + file of Rust crates. rustPlatform.buildRustPackage uses + cargo-vendor to collect and build dependent crates. + Since this change in cargo-vendor changes the set of + vendored files for most Rust packages, the hash that use used to verify + the dependencies, cargoSha256, also changes. - The cargoSha256 hashes of all in-tree derivations that - use buildRustPackage have been updated to reflect this - change. However, third-party derivations that use - buildRustPackage may have to be updated as well. + The cargoSha256 hashes of all in-tree derivations that + use buildRustPackage have been updated to reflect this + change. However, third-party derivations that use + buildRustPackage may have to be updated as well. - The consul package was upgraded past version 1.5, - so its deprecated legacy UI is no longer available. + The consul package was upgraded past version 1.5, + so its deprecated legacy UI is no longer available. - The default resample-method for PulseAudio has been changed from the upstream default speex-float-1 - to speex-float-5. Be aware that low-powered ARM-based and MIPS-based boards will struggle with this - so you'll need to set back to speex-float-1. + The default resample-method for PulseAudio has been changed from the upstream default speex-float-1 + to speex-float-5. Be aware that low-powered ARM-based and MIPS-based boards will struggle with this + so you'll need to set back to speex-float-1. -- cgit 1.4.1 From ea6e5db298a207a3346860a7d8bb645142ebb3ae Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 8 Jul 2019 20:14:46 -0500 Subject: rubocop: add marsam as maintainer --- pkgs/development/tools/rubocop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/rubocop/default.nix b/pkgs/development/tools/rubocop/default.nix index 288ccfa1524b..b91a36cb0613 100644 --- a/pkgs/development/tools/rubocop/default.nix +++ b/pkgs/development/tools/rubocop/default.nix @@ -11,7 +11,7 @@ bundlerEnv rec { description = "Automatic Ruby code style checking tool"; homepage = "https://docs.rubocop.org/"; license = licenses.mit; - maintainers = with maintainers; [ leemachin ]; + maintainers = with maintainers; [ marsam leemachin ]; platforms = platforms.unix; }; } -- cgit 1.4.1 From bdf9dc59ff0724cd9a0418e579c25524d47b9394 Mon Sep 17 00:00:00 2001 From: José Luis Lafuente Date: Sun, 30 Jun 2019 10:56:34 +0200 Subject: clojure: 1.10.0.442 -> 1.10.1.462 Updates jdk dependency from 8 to 11. Clojure 1.10.0 added support for jdk11, and was released with a new develper tool: REBL (https://github.com/cognitect-labs/REBL-distro). REBL depends on javafx, currently only supported on Nix by jdk11 (see #63574) --- pkgs/development/interpreters/clojure/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 4fe1e1820954..8df64de3acb6 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, jdk, rlwrap, makeWrapper }: +{ stdenv, fetchurl, jdk11, rlwrap, makeWrapper }: stdenv.mkDerivation rec { - name = "clojure-${version}"; - version = "1.10.0.442"; + pname = "clojure"; + version = "1.10.1.462"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "147pkid3pvw60gq8vansid3x6wwfy9pqdbla3wfd5qaxqbcrhclw"; + sha256 = "0mi7fzqvkg2ihigxkkamc742m1iba0yzy8ivciavzmpcnw128sc6"; }; buildInputs = [ makeWrapper ]; @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "prefix" ]; installPhase = let - binPath = stdenv.lib.makeBinPath [ rlwrap jdk ]; + binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ]; in '' mkdir -p $prefix/libexec cp clojure-tools-${version}.jar $prefix/libexec - cp {,example-}deps.edn $prefix + cp example-deps.edn $prefix substituteInPlace clojure --replace PREFIX $prefix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { offers a software transactional memory system and reactive Agent system that ensure clean, correct, multithreaded designs. ''; - maintainers = with maintainers; [ the-kenny ]; + maintainers = with maintainers; [ jlesquembre ]; platforms = platforms.unix; }; } -- cgit 1.4.1 From af014eccf3263726f83d7c3f47e4be025d576e91 Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Tue, 9 Jul 2019 09:15:37 +0100 Subject: Sort vim-plugin-names as per default.nix instructions and regenerate --- pkgs/misc/vim-plugins/generated.nix | 144 ++++++++++++++++----------------- pkgs/misc/vim-plugins/vim-plugin-names | 10 +-- 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 3b4893c0b684..138a3fe8c529 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-07-02"; + version = "2019-07-06"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "a5240009ba5ff22daad95c306f7dec372d46bda0"; - sha256 = "1l588l3b2h2bcc15xyn3v6rbh8irnh9jzdx0515sp4pcch1gqgfj"; + rev = "6c47d7fc352659cd2dc869a9a46a04a8492fc829"; + sha256 = "1xk69prw20d37zw6q83yiv31nw9hrlqprrs9yxrqrlh0zdgn7cn9"; }; }; @@ -248,12 +248,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2019-07-05"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "eed5413bc65e2b2dd8297f4937ec0eea3c12256a"; - sha256 = "1hncsmr11z9kq0jkdkxrpf5sm31qz1dkc38az20dlfba8b8p7x1g"; + rev = "8c7241d7e3f56bc2efda92c05e0148dcf7c41bc6"; + sha256 = "0agn16dj800sydqwjdr85m3d66hfbn8hh1azb2hsniwd5d1qkr6v"; }; }; @@ -425,34 +425,34 @@ let denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2019-04-29"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "chemzqm"; repo = "denite-git"; - rev = "b6a0c7d08a1477a1607ba8be3a33c1352f93d79d"; - sha256 = "001848nr3pdzv6z2c9a262n63gcln1dr98qamkr5c5khxc1da322"; + rev = "b3b3742f263475cc0e16c1c03845e46d0c0faa16"; + sha256 = "15m7y4mzzysfhmmzwj7q6y8d2rcczn6fvicw77j7njssf9fmwc10"; }; }; denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-07-06"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "f2fea7e01ad5799a3ddf920f2f3f3b6901485afb"; - sha256 = "06rhha7m8bvlbnrwa0f62arhcmi5h5jamzay5ybxfcbak4x28xb3"; + rev = "8a9f52235c32011c91ad3630bed88cdcc6b55b08"; + sha256 = "0wvawl32w3zg04l513h7cby0ks4zzxli6m3yzyyv92ajnkmj4n0h"; }; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2019-07-06"; + version = "2019-07-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "6b6944807dae822c0e30353f6ff45649eaa7b770"; - sha256 = "09if0a4yn9w7jfsq9rsfd7dl6s5m4rni65q536yaciw981vchxv3"; + rev = "4879e34f353cc8c2ac8cb5c14e3efebc15c05ab0"; + sha256 = "12r2770b78rm9xx0pb4qgfzlyjmhdji4q6iga2pflxik6rk0gw4c"; }; }; @@ -783,12 +783,12 @@ let gist-vim = buildVimPluginFrom2Nix { pname = "gist-vim"; - version = "2018-11-09"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "mattn"; repo = "gist-vim"; - rev = "3abf2444bb6a7744a64b4a2c2b02d6761a7de072"; - sha256 = "197j6bhyfggxka9mycyk3mr6sawf7rnaz74csk47d2qlkfs4zf0v"; + rev = "e485c6c24a62b378a2a4c8687e36e7f54ceca18c"; + sha256 = "1fkm7aada088l9f5rf6fk1valfanwzfrsfip9w4q9w2mqvd7n1kn"; }; }; @@ -1301,12 +1301,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-06-28"; + version = "2019-07-07"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "43007dac3e4c761caee7a5d8c74172da2af08ea6"; - sha256 = "1bxz0czckmc2cw7kh8cd1rcg0sg2pj7vjdlgwd0bmqr6x9xarp0d"; + rev = "3fe8bea59e6f19538968ea41ac33d6418071ffd6"; + sha256 = "0rnwzwk4vqvnp42854vxzxllyqap44p9wfppp89c1j0x2hi3ylih"; }; }; @@ -1400,12 +1400,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-07-04"; + version = "2019-07-07"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "89a1a4355bd9572d0f5b3d23733c243c6e7b05c2"; - sha256 = "0khc6dzngc9f19rnqdq69biawjy7xfs17dnix2gz6j9z8jsx794x"; + rev = "2f0d48d632dc303095084b382cb665ae57ad2e63"; + sha256 = "0zlfam5kvz3cyl40hk5g6bpmmwm62g6l73wf408q0v8k0zn87mb7"; }; }; @@ -1521,12 +1521,12 @@ let papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2019-06-19"; + version = "2019-07-07"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "8e7343ce8f28d5177939e394043ce0250e6f9a6e"; - sha256 = "08d0y7xr72d42jgb0y3w2qxl6i7kv4alqaplzmiw8xkd0m3dxss8"; + rev = "20f3b25cdd772d4483eb8ced453f94f93b6126e1"; + sha256 = "1yck7f48v9rz7wq2q2b372bv07qmpj562ncwfdiavsgy6wms3p4b"; }; }; @@ -1873,12 +1873,12 @@ let swift-vim = buildVimPluginFrom2Nix { pname = "swift-vim"; - version = "2018-09-12"; + version = "2019-07-09"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "5e330f026d4184c917cc156410634551dbd9a944"; - sha256 = "1gx2vg5w6r7k9070j03wz3bzjdkw3g01nkahd5jawk9z10ifswax"; + rev = "d3d66151598b5d6dda159524baa9c66b3d1bf5ad"; + sha256 = "0pq4nwdhnw3qzz3xaz9fpbf3p0l6vrmjkqj4lrfymafbmxc94j6w"; }; }; @@ -2643,12 +2643,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2019-07-03"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "69028519c368304a6bf95f629b924c2ea85c69db"; - sha256 = "0kndqqknl2c7rcd9ssfc7q0w84m6776gyszra52xhc1wlgdi0r77"; + rev = "0c9e6faaf246767c850eb92f48c4bdc068cdf235"; + sha256 = "1kmdzf34clhvcjwxr47phvw835nfhm70swar5s6cf2pis1wllmjw"; }; }; @@ -2797,12 +2797,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-07-05"; + version = "2019-07-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "ab8ffc76e56d5a3f187c3eefd11dfa3306491fde"; - sha256 = "1mwmja6y68sq8fsv2zy118mx3gy1cz8p9cigydnj1p7fxbn88km8"; + rev = "7c7641d18a8c530b70363e19f3f258b597b42484"; + sha256 = "0fpiv936qisadl87p9rim1y5qw0wwvl9clmy27rhy5bbspwr8pdr"; }; }; @@ -2841,12 +2841,12 @@ let vim-flutter = buildVimPluginFrom2Nix { pname = "vim-flutter"; - version = "2019-06-23"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "thosakwe"; repo = "vim-flutter"; - rev = "8d7a9158cca84c4ea2a5ebc066607652fab7a9e8"; - sha256 = "0kjr7nlqkkzlvh6p9j996bbcgd0frakla591y4ln12qwa7ys0gd1"; + rev = "7f12c91b9f3789ab3559eeed9ed8905afcca6dfb"; + sha256 = "07hx5hdqw0scgviqn92xjx8zcfl4ils94cdsp9jh2h98jqhcic1p"; }; }; @@ -2863,12 +2863,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-07-06"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "fdb57922a4d7937506232c1b64abbbfd5ee67ae9"; - sha256 = "0da3igjhyh0w7mz9dsc32vhglnny8w6nibmxs35am60hvi9h7703"; + rev = "102b3a50e20d857b38e4c392b78be9a340669a70"; + sha256 = "0q7icsjycxw4l5awapkj8sig297f37hcyk5s4ns0ldrylh0xckl9"; }; }; @@ -3160,12 +3160,12 @@ let vim-javascript = buildVimPluginFrom2Nix { pname = "vim-javascript"; - version = "2019-06-24"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "pangloss"; repo = "vim-javascript"; - rev = "8a599c5e84bb064e2345867332ecbcc252e3b04a"; - sha256 = "1hyn592812hav4n7g488ysmrqw0c2bjkwvfwkzz9xpwj1v25f2yl"; + rev = "7cc6baebaf0065fd8c31cc9216c87bfa543eb71a"; + sha256 = "0d905n5v4c8vifp229lijrylq6ajlsmxkl1w603nzkappw8kky1s"; }; }; @@ -3579,12 +3579,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2019-06-17"; + version = "2019-07-09"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "f1ad2d864ab43c56bf86ce01be9971f62bc14f6c"; - sha256 = "071vr96ckm1bwf6nfziv4fw4spz44d5g65fcx2b61fb36azwxggh"; + rev = "fddbcb8f1a37e216504b3d14859a0a992a81cd5d"; + sha256 = "1ijdmp081r9dpn4ryr6j36s56ahz3lnn9g72akby4hj6da1bj4mb"; }; }; @@ -3865,12 +3865,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-06-02"; + version = "2019-07-06"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "a11cf5b47fcb9de72b5c8694a4e2fe2dca8c0ae7"; - sha256 = "12k2ybk4dpc13spy2pxxnlip5rfzdbb3yjhr37hsgxhhjw6hibrq"; + rev = "c8e8b35e9a56aab5b1ef871a164b6e8d6ea79ad0"; + sha256 = "0lb6kmg4ckrxhys0k9gss3hp60x0mik10sm0y5g8yf74a1vzysvf"; }; }; @@ -4008,23 +4008,23 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-06-20"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "996917464cd6b6fd7f11905ac4d77314fcac5593"; - sha256 = "1bqqizqsn1nzqg02vis9v0rndkw24n3dkvrd799s04818rncm84m"; + rev = "6ee2aab70d8cd3d2405b3042141c94766ea461b0"; + sha256 = "1zld21a0l94hg3qvpb6rzi8kvv9f86mn7pl95rjvs022vfprry05"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-06-25"; + version = "2019-07-06"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "3507d31dccde27ea27e2858e00784d5be18565f4"; - sha256 = "0ap9bbk0qa3cz1rxykgrd5hv582av2n36x6s52awg90d4hx37inp"; + rev = "113c3bd92a18a0b20b0c63f8335139021afc8b0f"; + sha256 = "0ijxnbgz5l3y5gdavh0z7173dn7930xyn2rzz0sbja9m53f8yik7"; }; }; @@ -4283,34 +4283,34 @@ let vimproc-vim = buildVimPluginFrom2Nix { pname = "vimproc-vim"; - version = "2019-03-10"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "eb5b2b1248ccc8b1b9e84d7658508e38b964d17d"; - sha256 = "0h9na94cg396mldqdasdkv30z67zp5r36794dlhh9j5kblc00x0v"; + rev = "0328ac6096ac57d647bed1ee59c8b616b3ba2858"; + sha256 = "1apg6zjpqagj8m7rai64awp2n4s77grjlyr56hdk09bh9678wg31"; }; }; vimshell-vim = buildVimPluginFrom2Nix { pname = "vimshell-vim"; - version = "2018-06-02"; + version = "2019-07-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimshell.vim"; - rev = "03bf7673a5098918a533000d67dca97546695237"; - sha256 = "1ckxjap9kz8skbjchg561sqyd5y5qwacg8mabmniy78qa7i3qdzi"; + rev = "8aa928d4652286ad3106f6ef2cbbbf7eadec5a52"; + sha256 = "1qwccpsfjsap8lggq8k9cmvdzq1mgn1ss4bsdplk1pj7prlj9pxb"; }; }; vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-07-04"; + version = "2019-07-07"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "e0522f353d7d1ee69a1c7d26c512fa8af1921f43"; - sha256 = "0hqn9hmlim53s7gbaxzv3z7rg7lj5ayd42z5vqmkwsj4y2lmkzkb"; + rev = "bdc7ba470e477255ddb26c84c8934da58904c475"; + sha256 = "0hazv9xqjag6fgg7y34ilcnjd3pah259r1jazxwbkdxrzgc0pmhw"; }; }; @@ -4371,12 +4371,12 @@ let webapi-vim = buildVimPluginFrom2Nix { pname = "webapi-vim"; - version = "2018-03-14"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "mattn"; repo = "webapi-vim"; - rev = "252250381a9509257bfb06b9f95441e41e3e23b5"; - sha256 = "0g37d1i6rxsj6f31g9jy2bhr8ng3jwmnvqqcmw19vbql4v56zq6a"; + rev = "263e31b11948de7b20290b6ffc118e2c3223e2d2"; + sha256 = "08dd6qqvf24y5c49j2rirwfp78q6i5b7f6ng93gfkrx6adacin5d"; }; }; @@ -4494,12 +4494,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2019-07-03"; + version = "2019-07-08"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "2cbecaea8bd2d804d8ff1d74013e402a64ecb786"; - sha256 = "11ab4msfkl101340wdrn7am5rx3ll9b0r90f9mv9wxj531fizyvy"; + rev = "78c6336a9c28a1ae7e9699a65e7b46475e530978"; + sha256 = "009vjz75may02ahhh5v72nxaxpk4arghvisszsxk8dnqrc251avi"; }; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index ab6416748fad..115ee4e0d3a0 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -44,8 +44,8 @@ CoatiSoftware/vim-sourcetrail cocopon/iceberg.vim ctjhoa/spacevim ctrlpvim/ctrlp.vim -dag/vim-fish dag/vim2hs +dag/vim-fish dannyob/quickfixstatus dart-lang/dart-vim-plugin davidhalter/jedi-vim @@ -164,8 +164,8 @@ lepture/vim-jinja lervag/vimtex lfilho/cosco.vim LnL7/vim-nix -LucHermitte/lh-vim-lib LucHermitte/lh-brackets +LucHermitte/lh-vim-lib ludovicchabant/vim-gutentags ludovicchabant/vim-lawrencium lukaszkorecki/workflowish @@ -231,9 +231,9 @@ ncm2/ncm2-ultisnips neoclide/coc.nvim neoclide/vim-easygit neomake/neomake -neovim/nvimdev.nvim neovimhaskell/haskell-vim neovimhaskell/nvim-hs.vim +neovim/nvimdev.nvim neutaaaaan/iosvkem nixprime/cpsm NLKNguyen/papercolor-theme @@ -363,14 +363,15 @@ valloric/youcompleteme vhda/verilog_systemverilog.vim vim-airline/vim-airline vim-airline/vim-airline-themes +vimoutliner/vimoutliner vim-pandoc/vim-pandoc vim-pandoc/vim-pandoc-after vim-pandoc/vim-pandoc-syntax vim-ruby/vim-ruby -vim-scripts/a.vim vim-scripts/align vim-scripts/argtextobj.vim vim-scripts/autoload_cscope.vim +vim-scripts/a.vim vim-scripts/bats.vim vim-scripts/changeColorScheme.vim vim-scripts/Colour-Sampler-Pack @@ -389,7 +390,6 @@ vim-scripts/taglist.vim vim-scripts/wombat256.vim vim-scripts/YankRing.vim vim-utils/vim-husk -vimoutliner/vimoutliner vimwiki/vimwiki vmchale/dhall-vim w0rp/ale -- cgit 1.4.1 From ed48a81a0a91cb1b6c1e2b36a8bfd04fcb8e3682 Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Tue, 9 Jul 2019 09:17:01 +0100 Subject: vimPlugins.jq-vim: init at 2019-05-21 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 138a3fe8c529..01cf7da1fe35 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1002,6 +1002,17 @@ let }; }; + jq-vim = buildVimPluginFrom2Nix { + pname = "jq-vim"; + version = "2019-05-21"; + src = fetchFromGitHub { + owner = "vito-c"; + repo = "jq.vim"; + rev = "6e056fa297ce58d45500b0937b8214400e9a50fa"; + sha256 = "0dfsym34xiza9221bdsr51jykcxmz8bnkzi846bqxxjxiw0p3yk1"; + }; + }; + julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; version = "2019-06-26"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 115ee4e0d3a0..5262a6fccee3 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -391,6 +391,7 @@ vim-scripts/wombat256.vim vim-scripts/YankRing.vim vim-utils/vim-husk vimwiki/vimwiki +vito-c/jq.vim vmchale/dhall-vim w0rp/ale wakatime/vim-wakatime -- cgit 1.4.1 From 2f04b2319f32e3421761f6d0fcef14f88dc4c14b Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Tue, 9 Jul 2019 09:18:47 +0100 Subject: vimPlguins.wmgraphviz-vim: init at 2018-04-26 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 01cf7da1fe35..6ef08fc6bf5d 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4391,6 +4391,17 @@ let }; }; + wmgraphviz-vim = buildVimPluginFrom2Nix { + pname = "wmgraphviz-vim"; + version = "2018-04-26"; + src = fetchFromGitHub { + owner = "wannesm"; + repo = "wmgraphviz.vim"; + rev = "f08ff5becd1e6e81d681ff2926f2cce29f63cb18"; + sha256 = "12mb0lbkrzrxyawd9gg6igmsaylvsixcslim0lcgsrd551l9lq2l"; + }; + }; + wombat256-vim = buildVimPluginFrom2Nix { pname = "wombat256-vim"; version = "2010-10-18"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 5262a6fccee3..2ad7b396f456 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -395,6 +395,7 @@ vito-c/jq.vim vmchale/dhall-vim w0rp/ale wakatime/vim-wakatime +wannesm/wmgraphviz.vim wellle/targets.vim wellle/tmux-complete.vim will133/vim-dirdiff -- cgit 1.4.1 From 0a60534cd8afe1b642f03c612b9970e050994f6b Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Tue, 9 Jul 2019 09:19:45 +0100 Subject: vimPlugins.vim-glsl: init at 2017-10-15 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 6ef08fc6bf5d..64b250e3a4c7 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2938,6 +2938,17 @@ let }; }; + vim-glsl = buildVimPluginFrom2Nix { + pname = "vim-glsl"; + version = "2017-10-15"; + src = fetchFromGitHub { + owner = "tikhomirov"; + repo = "vim-glsl"; + rev = "697eca9784ffac39308e1fd45e0300582c3d060b"; + sha256 = "0qj00wgshx0pm6w1p682kc6s4xnzshnwx0sr65b24g1m495ck4q4"; + }; + }; + vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; version = "2019-07-04"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 2ad7b396f456..b0e4dad8911b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -324,6 +324,7 @@ thinca/vim-scouter thinca/vim-themis thinca/vim-visualstar thosakwe/vim-flutter +tikhomirov/vim-glsl tomasr/molokai tomlion/vim-solidity tommcdo/vim-lion -- cgit 1.4.1 From c0b2c6973636e3e763642d6b23e0c708fd18f548 Mon Sep 17 00:00:00 2001 From: Michael Bishop Date: Mon, 8 Jul 2019 03:47:41 -0300 Subject: ipxe: fix build by not generating 64bit efi on 32bit systems --- pkgs/tools/misc/ipxe/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 99b7ea10bd35..a9cddcc5ff81 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -5,8 +5,7 @@ let date = "20190318"; rev = "ebf2eaf515e46abd43bc798e7e4ba77bfe529218"; - targets = [ - "bin-x86_64-efi/ipxe.efi" + targets = (lib.optional stdenv.isx86_64 "bin-x86_64-efi/ipxe.efi") ++ [ "bin/ipxe.dsk" "bin/ipxe.usb" "bin/ipxe.iso" -- cgit 1.4.1 From 3a7ff4e44d42d44a102a86e38334467769bc5148 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 5 Jul 2019 21:17:36 -0500 Subject: okteta: 0.26.1 -> 0.26.2 --- pkgs/applications/editors/okteta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index ffa80bc68cae..03bdd5e08822 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "okteta-${version}"; - version = "0.26.1"; + version = "0.26.2"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz"; - sha256 = "1bqq3ax47xym3ikwn6xsshs1b5gpfg5djrnkzszqnp127f1fxi54"; + sha256 = "0k38hd9wq6jvzy0225y61rzr7lgwbac1haalhsrfpmyjy6d833dv"; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; -- cgit 1.4.1 From f51c4d463ba343e1dbf56e1c07d2005fdee8fd33 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 5 Jul 2019 19:20:54 -0500 Subject: xscreensaver: 5.40 -> 5.43 https://www.jwz.org/xscreensaver/changelog.html --- pkgs/misc/screensavers/xscreensaver/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 6a9dfaef497a..3edfa9553d6d 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "5.40"; - name = "xscreensaver-${version}"; + version = "5.43"; + pname = "xscreensaver"; src = fetchurl { - url = "https://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "1q2sr7h6ps6d3hk8895g12rrcqiihjl7py1ly077ikv4866r181h"; + url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1m43nfcpagv03zwlivpzp82qdv590s5c8vjjn4iirqjl6mzvdshp"; }; buildInputs = -- cgit 1.4.1 From 96ceff97da009d9605287e70cd20b04409ea30c6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 7 Jul 2019 13:08:31 +0200 Subject: hackage2nix: update list of broken Haskell builds --- .../haskell-modules/configuration-hackage2nix.yaml | 341 ++------------------- 1 file changed, 32 insertions(+), 309 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index cb11bb6f4b93..ee519f903ca9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2627,7 +2627,6 @@ broken-packages: - accelerate-arithmetic - accelerate-fftw - accelerate-fourier - - accelerate-llvm - accelerate-llvm-native - accelerate-random - accelerate-typelits @@ -2691,7 +2690,6 @@ broken-packages: - aeson-applicative - aeson-decode - aeson-diff-generic - - aeson-extra - aeson-flowtyped - aeson-injector - aeson-native @@ -2752,8 +2750,6 @@ broken-packages: - amazon-emailer - amazon-emailer-client-snap - amazon-products - - amazonka-cognito-identity - - amazonka-ecs - amby - AMI - ampersand @@ -2866,7 +2862,6 @@ broken-packages: - asil - asn - asn1-codec - - AspectAG - assert - assertions - asset-map @@ -2878,7 +2873,6 @@ broken-packages: - async-combinators - async-dejafu - async-manager - - async-pool - async-timer - asynchronous-exceptions - aterm @@ -2900,13 +2894,11 @@ broken-packages: - AttoJson - attoparsec-data - attoparsec-enumerator - - attoparsec-ip - attoparsec-iteratee - attoparsec-text - attoparsec-text-enumerator - attoparsec-time - attoparsec-trans - - attoparsec-uri - attosplit - Attrac - atuin @@ -3011,7 +3003,6 @@ broken-packages: - bdcs-api - beam - beam-newtype-field - - beam-postgres - beam-th - beamable - beautifHOL @@ -3028,9 +3019,7 @@ broken-packages: - besout - bet - betacode - - betris - bff - - bgmax - bgzf - bhoogle - bibdb @@ -3088,7 +3077,6 @@ broken-packages: - bindynamic - binembed - binembed-example - - bins - bio - bio-sequence - bioace @@ -3123,6 +3111,7 @@ broken-packages: - bird - BirdPP - bisect-binary + - bishbosh - bit-array - bit-stream - bitcoin-hs @@ -3195,10 +3184,8 @@ broken-packages: - boombox - boomslang - borel - - boring - boring-window-switcher - bot - - bound-extras - bounded-array - bowntz - braid @@ -3215,7 +3202,6 @@ broken-packages: - bricks-rendering - bricks-syntax - brillig - - broadcast-chan - broadcast-chan-conduit - broadcast-chan-pipes - broadcast-chan-tests @@ -3254,7 +3240,7 @@ broken-packages: - butterflies - bv-sized - bytable - - bytestring-arbitrary + - byteslice - bytestring-builder-varword - bytestring-class - bytestring-csv @@ -3286,7 +3272,6 @@ broken-packages: - cabal-ghc-dynflags - cabal-ghci - cabal-graphdeps - - cabal-helper - Cabal-ide-backend - cabal-info - cabal-install-bundle @@ -3317,7 +3302,6 @@ broken-packages: - cabin - cabocha - cached - - cacophony - caffegraph - cairo-core - cake @@ -3335,7 +3319,6 @@ broken-packages: - call-haskell-from-anything - camfort - campfire - - canon - canonical-filepath - canonical-json - canteven-http @@ -3346,7 +3329,6 @@ broken-packages: - cao - cap - Capabilities - - capability - capataz - capnp - capped-list @@ -3372,7 +3354,6 @@ broken-packages: - cash - cassandra-cql - Cassava - - cassava-streams - cassette - cassy - castle @@ -3429,8 +3410,8 @@ broken-packages: - chatwork - cheapskate-terminal - check-pvp - - Checked - checked + - Checked - checkmate - chessIO - chevalier-common @@ -3573,7 +3554,6 @@ broken-packages: - colorless - colorless-http-client - colorless-scotty - - colour-accelerate - colour-space - coltrane - columbia @@ -3585,8 +3565,6 @@ broken-packages: - combinatorial-problems - Combinatorrent - combobuffer - - comfort-array - - comic - Command - commander - Commando @@ -3605,8 +3583,6 @@ broken-packages: - competition - compilation - complexity - - componentm - - componentm-devel - compose-trans - composite-aeson - composite-aeson-refined @@ -3634,8 +3610,8 @@ broken-packages: - concurrent-state - Concurrential - ConcurrentUtils - - Condor - condor + - Condor - condorcet - conductive-base - conductive-hsc3 @@ -3643,15 +3619,11 @@ broken-packages: - conduit-audio-lame - conduit-audio-samplerate - conduit-find - - conduit-merge - conduit-network-stream - conduit-resumablesink - conduit-throttle - conduit-tokenize-attoparsec - - conduit-vfs - - conduit-vfs-zip - conf - - confcrypt - conffmt - confide - config-parser @@ -3669,7 +3641,6 @@ broken-packages: - connection-string - Conscript - consistent - - console-program - const-math-ghc-plugin - constrained-categories - constrained-category @@ -3680,7 +3651,6 @@ broken-packages: - constraint-reflection - ConstraintKinds - constraints-emerge - - constraints-extras - constructive-algebra - consul-haskell - Consumer @@ -3699,7 +3669,6 @@ broken-packages: - continuum - continuum-client - Contract - - control-event - control-monad-attempt - control-monad-exception - control-monad-exception-monadsfd @@ -3714,14 +3683,8 @@ broken-packages: - convert-annotation - convertible-ascii - convertible-text - - copilot - - copilot-c99 - copilot-cbmc - - copilot-core - - copilot-language - - copilot-libraries - copilot-sbv - - copilot-theorem - copr - COrdering - core @@ -3802,7 +3765,6 @@ broken-packages: - crystalfontz - cse-ghc-plugin - csg - - csound-catalog - CSPM-cspm - CSPM-FiringRules - CSPM-Frontend @@ -3819,7 +3781,6 @@ broken-packages: - cube - cuboid - cudd - - curl-runnings - currency-convert - curry-frontend - CurryDB @@ -3829,15 +3790,14 @@ broken-packages: - curves - custom-prelude - CV - - cyclotomic - cypher - d-bus - d3js - dag - DAG-Tournament - Dangerous - - Dao - dao + - Dao - dapi - darcs-benchmark - darcs-beta @@ -3871,7 +3831,6 @@ broken-packages: - data-fin - data-fin-simple - data-flagset - - data-interval - data-ivar - data-kiln - data-layer @@ -3892,8 +3851,8 @@ broken-packages: - data-repr - data-result - data-rev - - Data-Rope - data-rope + - Data-Rope - data-rtuple - data-size - data-spacepart @@ -4009,7 +3968,6 @@ broken-packages: - deunicode - devil - dewdrop - - df1 - dfinity-radix-tree - Dflow - dfsbuild @@ -4017,11 +3975,7 @@ broken-packages: - dgs - dhall-check - dhall-nix - - dhall-to-cabal - dhcp-lease-parser - - di - - di-df1 - - di-handle - dia-base - dia-functions - diagrams-boolean @@ -4087,12 +4041,9 @@ broken-packages: - disjoint-set-stateful - diskhash - disposable - - Dist - dist-upload - distance - DisTract - - distributed-closure - - distributed-fork - distributed-fork-aws-lambda - distributed-process - distributed-process-async @@ -4120,6 +4071,7 @@ broken-packages: - dixi - djembe - djinn-th + - dl-fedora - dmenu - dmenu-pkill - dmenu-pmount @@ -4132,7 +4084,6 @@ broken-packages: - doc-review - doccheck - docidx - - docker - docker-build-cacher - dockercook - DocTest @@ -4184,7 +4135,6 @@ broken-packages: - dsh-sql - dsmc - dsmc-tools - - dson - dson-parsec - DSTM - dstring @@ -4224,8 +4174,6 @@ broken-packages: - easy-api - easyjson - easyplot - - easytensor - - easytensor-vulkan - ebeats - ebnf-bff - ecma262 @@ -4242,8 +4190,7 @@ broken-packages: - editline - EditTimeReport - effect-handlers - - effects - - effects-parser + - effect-stack - effin - egison-quote - egison-tutorial @@ -4258,23 +4205,19 @@ broken-packages: - ekg-elasticsearch - ekg-influxdb - ekg-log - - ekg-prometheus-adapter - ekg-push - ekg-rrd - elevator - elision - elm-websocket - - elsa - emacs-keys - email - email-header - email-postmark - - email-validator - emailparse - embeddock - embeddock-example - embroidery - - emd - emgm - Emping - Empty @@ -4286,7 +4229,6 @@ broken-packages: - engine-io-snap - engine-io-wai - engine-io-yesod - - ENIG - entangle - EntrezHTTP - entwine @@ -4363,7 +4305,6 @@ broken-packages: - eventful-dynamodb - eventful-postgresql - eventlog2html - - eventloop - EventSocket - eventsource-geteventstore-store - eventstore @@ -4372,7 +4313,6 @@ broken-packages: - exact-real - exact-real-positional - except-exceptions - - exception-hierarchy - exception-monads-fd - exchangerates - execs @@ -4402,7 +4342,6 @@ broken-packages: - extemp - extended-categories - extensible-data - - extensible-effects-concurrent - Extra - extract-dependencies - extractelf @@ -4411,6 +4350,7 @@ broken-packages: - f-ree-hack-cheats-free-v-bucks-generator - Facebook-Password-Hacker-Online-Latest-Version - faceted + - factory - Facts - factual-api - fadno @@ -4419,7 +4359,6 @@ broken-packages: - failable-list - failure-detector - FailureT - - fake - fake-type - faktory - falling-turnip @@ -4433,23 +4372,13 @@ broken-packages: - fastedit - fastirc - fastly - - fastparser - FastPush - FastxPipe - fathead-util - fault-tree - - fay - - fay-base - fay-builder - - fay-dom - - fay-geoposition - fay-hsx - - fay-jquery - - fay-ref - fay-simplejson - - fay-text - - fay-uri - - fay-websockets - fb-persistent - fbmessenger-api - fca @@ -4499,15 +4428,14 @@ broken-packages: - FileManipCompat - fileneglect - filepath-io-access - - FilePather - filepather + - FilePather - Files - FileSystem - filesystem-conduit - filesystem-enumerator - filesystem-trees - fillit - - fin - final-pretty-printer - Finance-Quote-Yahoo - Finance-Treasury @@ -4522,6 +4450,7 @@ broken-packages: - first-and-last - firstify - FirstOrderTheory + - fishfood - fit - fitsio - fix-parser-simple @@ -4649,8 +4578,6 @@ broken-packages: - fresh - friday-devil - friday-scale-dct - - friendly - - front - frown - frp-arduino - frpnow @@ -4669,7 +4596,6 @@ broken-packages: - FTPLine - ftshell - full-sessions - - full-text-search - fullstop - funbot - funbot-client @@ -4739,7 +4665,6 @@ broken-packages: - GeneralTicTacToe - generators - generic-accessors - - generic-aeson - generic-binary - generic-church - generic-enum @@ -4751,7 +4676,6 @@ broken-packages: - generic-tree - generic-xml - generic-xmlpickler - - generics-eot - genericserialize - genesis - genesis-test @@ -4783,9 +4707,7 @@ broken-packages: - gh-labeler - ghc-core-smallstep - ghc-datasize - - ghc-dump-core - ghc-dump-tree - - ghc-dump-util - ghc-dup - ghc-events-analyze - ghc-events-parallel @@ -4815,8 +4737,6 @@ broken-packages: - ghci-lib - ghci-ng - ghcjs-base-stub - - ghcjs-dom - - ghcjs-dom-jsaddle - ghcjs-dom-jsffi - ghcjs-fetch - ghcjs-hplay @@ -4859,7 +4779,6 @@ broken-packages: - git-fmt - git-gpush - git-jump - - git-monitor - git-object - git-remote-ipfs - git-repair @@ -4877,12 +4796,9 @@ broken-packages: - gitit - gitlab-api - gitlib-cross - - gitlib-libgit2 - gitlib-s3 - - gitlib-test - gitlib-utils - gitson - - gitter - glade - gladexml-accessor - glapp @@ -4895,7 +4811,6 @@ broken-packages: - gli - glicko - glider-nlp - - glirc - GLMatrix - glob-posix - global @@ -4904,7 +4819,6 @@ broken-packages: - glome-hs - GlomeTrace - GlomeView - - gloss-accelerate - gloss-banana - gloss-devil - gloss-export @@ -4912,10 +4826,6 @@ broken-packages: - gloss-sodium - glpk-hs - glue - - glue-common - - glue-core - - glue-ekg - - glue-example - gmap - gmndl - gnome-desktop @@ -4945,7 +4855,6 @@ broken-packages: - googlepolyline - GoogleSB - GoogleTranslate - - gopher-proxy - gopherbot - gore-and-ash - gore-and-ash-actor @@ -4960,7 +4869,6 @@ broken-packages: - GotoT-transformers - gotta-go-fast - gpah - - GPipe - GPipe-Collada - GPipe-Examples - GPipe-GLFW @@ -5023,7 +4931,6 @@ broken-packages: - GroteTrap - groundhog-converters - group-with - - grouped-list - growler - GrowlNotify - grpc-etcd-client @@ -5098,8 +5005,6 @@ broken-packages: - hackmanager - hactor - hactors - - haddock - - haddock-api - haddock-leksah - haddock-test - haddocset @@ -5127,15 +5032,9 @@ broken-packages: - hakyll-contrib-links - hakyll-convert - hakyll-dhall - - hakyll-dir-list - - hakyll-favicon - hakyll-filestore - - hakyll-images - hakyll-ogmarkup - hakyll-R - - hakyll-sass - - hakyll-series - - hakyll-shakespeare - hakyll-shortcode - hakyll-shortcut-links - halberd @@ -5217,9 +5116,7 @@ broken-packages: - haroonga-httpd - harpy - harvest-api - - has - has-th - - HasBigDecimal - HasCacBDD - hascas - Haschoo @@ -5254,7 +5151,6 @@ broken-packages: - haskell-conll - haskell-course-preludes - haskell-disque - - haskell-docs - haskell-eigen-util - haskell-formatter - haskell-ftp @@ -5266,7 +5162,6 @@ broken-packages: - haskell-lsp-client - haskell-ml - haskell-mpfr - - haskell-names - haskell-neo4j-client - haskell-openflow - haskell-overridez @@ -5441,8 +5336,8 @@ broken-packages: - hdaemonize-buildfix - hdbc-aeson - HDBC-mysql - - HDBC-postgresql-hstore - hdbc-postgresql-hstore + - HDBC-postgresql-hstore - hdbi - hdbi-conduit - hdbi-postgresql @@ -5456,7 +5351,6 @@ broken-packages: - hdiscount - hdm - hdo - - hdocs - hdph - hdph-closure - hdr-histogram @@ -5531,7 +5425,6 @@ broken-packages: - hexquote - hext - heyefi - - heyting-algebras - hF2 - hfann - hfd @@ -5564,7 +5457,6 @@ broken-packages: - hgrib - hharp - HHDL - - hhp - hi-file-parser - hi3status - hiccup @@ -5578,7 +5470,6 @@ broken-packages: - hierarchy - hiernotify - Hieroglyph - - higgledy - HiggsSet - higherorder - highjson @@ -5640,15 +5531,14 @@ broken-packages: - hlibfam - HList - HListPP - - HLogger - hlogger + - HLogger - hlongurl - hls - hlwm - hly - hmark - hmarkup - - hmatrix-backprop - hmatrix-banded - hmatrix-mmap - hmatrix-morpheus @@ -5773,7 +5663,6 @@ broken-packages: - hR - hranker - HRay - - hrfsize - hricket - Hricket - hriemann @@ -5930,8 +5819,6 @@ broken-packages: - hsreadability - hsseccomp - hsSqlite3 - - hssqlppp - - hssqlppp-th - HsSVN - hstatistics - hstats @@ -6035,24 +5922,18 @@ broken-packages: - hw-dump - hw-eliasfano - hw-excess - - hw-fingertree - hw-ip - hw-json - hw-json-lens - - hw-json-simd - hw-json-simple-cursor - hw-json-standard-cursor - hw-packed-vector - - hw-parser - - hw-prim - - hw-prim-bits - hw-rankselect - hw-rankselect-base - hw-simd - hw-streams - hw-succinct - hw-uri - - hw-vector - hw-xml - hwall-auth-iitk - hweblib @@ -6152,6 +6033,7 @@ broken-packages: - imap - imapget - imbib + - imgur - imgurder - imj-animation - imj-base @@ -6222,7 +6104,6 @@ broken-packages: - invertible-hlist - io-capture - io-reactive - - ion - IOR - IORefCAS - iostring @@ -6269,16 +6150,7 @@ broken-packages: - iterIO - iterio-server - ivor - - ivory - - ivory-backend-c - ivory-bitdata - - ivory-eval - - ivory-examples - - ivory-hw - - ivory-opts - - ivory-quickcheck - - ivory-serialize - - ivory-stdlib - ivy-web - ixdopp - ixmonad @@ -6286,14 +6158,13 @@ broken-packages: - iyql - j2hs - jack-bindings - - JackMiniMix - jackminimix + - JackMiniMix - jacobi-roots - jaeger-flamegraph - jail - jalaali - jalla - - jammittools - jarfind - jarify - jason @@ -6328,7 +6199,6 @@ broken-packages: - jonathanscard - jpeg - js-good-parts - - jsaddle-dom - jsaddle-hello - jsaddle-warp - jsaddle-wkwebview @@ -6359,7 +6229,7 @@ broken-packages: - JSONb - jsonextfilter - JsonGrammar - - JSONParser + - jsonpath - jsonresume - jsonrpc-conduit - jsons-to-schema @@ -6387,10 +6257,9 @@ broken-packages: - kademlia - kafka-client - kaleidoscope - - Kalman - kalman + - Kalman - kangaroo - - kanji - kansas-lava - kansas-lava-cores - kansas-lava-papilio @@ -6405,10 +6274,8 @@ broken-packages: - katip-syslog - katt - kawaii - - kazura-queue - kd-tree - kdesrc-build-extra - - kdt - keccak - keera-hails-i18n - keera-hails-mvc-environment-gtk @@ -6458,7 +6325,6 @@ broken-packages: - ktx - kure - kure-your-boilerplate - - kurita - KyotoCabinet - l-bfgs-b - L-seed @@ -6473,7 +6339,6 @@ broken-packages: - lambda-calculator - lambda-canvas - lambda-devs - - lambda-options - lambda-toolbox - lambda2js - lambdaBase @@ -6557,7 +6422,6 @@ broken-packages: - language-vhdl - language-webidl - lapack - - lapack-comfort-array - Lastik - lat - latest-npm-version @@ -6590,7 +6454,6 @@ broken-packages: - leanpub-wreq - leapseconds - learn - - learn-physics - learn-physics-examples - Learning - leetify @@ -6600,7 +6463,6 @@ broken-packages: - legion-extra - leksah-server - lendingclub - - lens-accelerate - lens-filesystem - lens-prelude - lens-text-encoding @@ -6624,7 +6486,6 @@ broken-packages: - libconfig - libcspm - libexpect - - libffi-dynamic - libGenI - libhbb - libinfluxdb @@ -6642,7 +6503,6 @@ broken-packages: - librandomorg - librato - libsystemd-daemon - - libsystemd-journal - libtagc - libxls - libxml-enumerator @@ -6662,7 +6522,6 @@ broken-packages: - linda - linden - line-drawing - - linear-accelerate - linear-algebra-cblas - linear-circuit - linear-code @@ -6693,7 +6552,6 @@ broken-packages: - lio-simple - lipsum-gen - liquid - - liquidhaskell-cabal-demo - list-fusion-probe - list-mux - list-prompt @@ -6722,7 +6580,6 @@ broken-packages: - llvm-general - llvm-general-pure - llvm-general-quote - - llvm-hs - llvm-hs-pretty - llvm-ht - llvm-pkg-config @@ -6750,7 +6607,6 @@ broken-packages: - logging-effect-extra - logging-effect-extra-file - logging-effect-extra-handler - - logging-facade-journald - Logic - logic-classes - logic-TPTP @@ -6792,12 +6648,10 @@ broken-packages: - LslPlus - lsp-test - lsystem - - ltext - ltk - lua-bc - luachunk - luautils - - lucid-svg - lucienne - Lucu - lui @@ -6828,7 +6682,6 @@ broken-packages: - madlang - mage - magic-wormhole - - magicbane - MagicHaskeller - magico - magma @@ -6866,7 +6719,6 @@ broken-packages: - mangopay - manifold-random - manifolds - - manifolds-core - map-exts - map-reduce-folds - map-syntax @@ -6927,13 +6779,12 @@ broken-packages: - mecab - mech - Mecha - - Mechs - mechs + - Mechs - med-module - mediabus - mediabus-fdk-aac - mediabus-rtp - - median-stream - mediawiki - medium-sdk-haskell - mellon-core @@ -7004,7 +6855,6 @@ broken-packages: - miniplex - minirotate - ministg - - minitypeset-opengl - minst-idx - mios - mirror-tweet @@ -7020,25 +6870,25 @@ broken-packages: - ml-w - mlist - mltool + - mmark + - mmark-cli + - mmark-ext - mmtf - mmtl - mmtl-base - moan - Mobile-Legends-Hack-Cheats - - mockazo - - model - modelicaparser - modify-fasta - modsplit - - modular - modular-prelude - modular-prelude-classy - modularity - module-management - modulespection - modulo - - Moe - moe + - Moe - MoeDict - mohws - mole @@ -7073,7 +6923,6 @@ broken-packages: - monad-unify - monad-var - monad-wrap - - monadacme - MonadCatchIO-mtl - MonadCatchIO-mtl-foreign - MonadCatchIO-transformers @@ -7112,7 +6961,6 @@ broken-packages: - monzo - moo - moonshine - - more-containers - morfette - morfeusz - morley @@ -7124,11 +6972,6 @@ broken-packages: - morte - mosaico-lib - moss - - moto - - moto-postgresql - - motor - - motor-diagrams - - motor-reflection - mount - movie-monad - mp @@ -7146,8 +6989,6 @@ broken-packages: - mrifk - mrm - ms - - msgpack - - msgpack-aeson - msgpack-idl - msgpack-rpc - msh @@ -7172,7 +7013,6 @@ broken-packages: - multiaddr - multiarg - multibase - - multifile - multifocal - multihash - multihash-serialise @@ -7184,7 +7024,6 @@ broken-packages: - multirec-alt-deriver - multirec-binary - multisetrewrite - - multistate - multivariant - Munkres-simple - muon @@ -7211,7 +7050,6 @@ broken-packages: - mvc - mvc-updates - mvclient - - mwc-random-accelerate - mxnet - mxnet-dataiter - mxnet-examples @@ -7246,7 +7084,6 @@ broken-packages: - nanovg - nanovg-simple - nanq - - naqsha - narc - nat-sized-numbers - nationstates @@ -7272,13 +7109,11 @@ broken-packages: - nested-sequence - NestedFunctor - nestedmap - - net-spider - net-spider-pangraph - net-spider-rpl - netclock - netcore - netease-fm - - netlib-comfort-array - netlines - netrium - NetSNMP @@ -7318,7 +7153,6 @@ broken-packages: - network-transport-inmemory - network-transport-tcp - network-transport-tests - - network-transport-zeromq - network-voicetext - network-wai-router - network-websocket @@ -7343,12 +7177,10 @@ broken-packages: - nice-html - nicovideo-translator - nikepub - - nimber - Ninjas - nirum - nitro - niv - - nix-eval - nixfromnpm - nixpkgs-update - nkjp @@ -7378,7 +7210,6 @@ broken-packages: - notifications-tray-icon - notmuch-haskell - notmuch-web - - NoTrace - np-linear - nptools - ntha @@ -7404,7 +7235,6 @@ broken-packages: - numhask-test - Nussinov78 - Nutri - - nvim-hs-ghcid - NXT - NXTDSL - nylas @@ -7440,11 +7270,10 @@ broken-packages: - oidc-client - ois-input-manager - olwrapper - - om-elm - omaketex - ombra - - Omega - omega + - Omega - omnifmt - on-a-horse - onama @@ -7459,11 +7288,9 @@ broken-packages: - open-haddock - open-pandoc - open-signals - - open-typerep - OpenAFP - OpenAFP-Utils - openapi-petstore - - opench-meteo - OpenCL - OpenCLRaw - OpenCLWrappers @@ -7529,7 +7356,6 @@ broken-packages: - packunused - pacman-memcache - padKONTROL - - pads-haskell - pagarme - PageIO - pagure-hook-receiver @@ -7537,7 +7363,6 @@ broken-packages: - pam - panda - pandoc-include - - pandoc-include-code - pandoc-japanese-filters - pandoc-lens - pandoc-plantuml-diagrams @@ -7564,7 +7389,6 @@ broken-packages: - Parallel-Arrows-Eden - parallel-tasks - parameterized - - parameterized-utils - paramtree - paranoia - parco @@ -7595,7 +7419,6 @@ broken-packages: - pasta - pastis - pasty - - patat - patches-vector - Pathfinder - pathfindingcore @@ -7630,7 +7453,6 @@ broken-packages: - pedestrian-dag - peg - peggy - - pencil - penny - penny-bin - penny-lib @@ -7640,8 +7462,8 @@ broken-packages: - peregrin - perf - perf-analysis - - PerfectHash - perfecthash + - PerfectHash - perhaps - periodic - perm @@ -7676,7 +7498,6 @@ broken-packages: - peyotls-codec - pez - pg-harness - - pg-harness-server - pg-recorder - pg-store - pg-transact @@ -7702,7 +7523,6 @@ broken-packages: - picoparsec - picosat - pictikz - - pidfile - pier - pier-core - piet @@ -7734,7 +7554,6 @@ broken-packages: - pipes-p2p - pipes-p2p-examples - pipes-protolude - - pipes-random - pipes-rt - pipes-s3 - pipes-shell @@ -7756,7 +7575,6 @@ broken-packages: - plan-applicative - plan-b - planar-graph - - planb-token-introspection - planet-mitchell - planet-mitchell-test - plankton @@ -7810,7 +7628,6 @@ broken-packages: - polysoup - polytypeable - polytypeable-utils - - pomaps - pomodoro - pomohoro - ponder @@ -7821,10 +7638,10 @@ broken-packages: - poppler - portager - porte - - porter - PortFusion - ports - posix-acl + - posix-api - posix-realtime - posix-waitpid - postcodes @@ -7878,13 +7695,11 @@ broken-packages: - presburger - press - presto-hdbc - - pretty-ghci - pretty-ncols - pretty-relative-time - prettyprinter-vty - preview - prim-array - - prim-instances - primes-type - primitive-addr - primitive-atomic @@ -7892,7 +7707,6 @@ broken-packages: - primitive-containers - primitive-extras - primitive-indexed - - primitive-maybe - primitive-simd - primitive-sort - primitive-unlifted @@ -7930,7 +7744,6 @@ broken-packages: - project-m36 - projectile - prolog-graph - - prometheus - prometheus-effect - promise - pronounce @@ -7957,7 +7770,6 @@ broken-packages: - proxy-mapping - psc-ide - pseudo-trie - - pthread - PTQ - ptr - publicsuffixlistcreate @@ -8029,7 +7841,6 @@ broken-packages: - QuickAnnotate - quickbooks - quickcheck-arbitrary-template - - quickcheck-classes - quickcheck-poly - quickcheck-property-comb - quickcheck-property-monad @@ -8061,7 +7872,6 @@ broken-packages: - quoridor-hs - qux - R-pandoc - - raaz - rad - radium - radium-formula-parser @@ -8094,7 +7904,6 @@ broken-packages: - rank1dynamic - rank2classes - Ranka - - rapid - rapid-term - rasa - rasa-example-config @@ -8120,8 +7929,6 @@ broken-packages: - razom-text-util - rbr - rc - - rcu - - rdf - rdf4h - rdioh - react-flux @@ -8171,12 +7978,9 @@ broken-packages: - refcount - Referees - refh - - refined - reflection-extras - reflex-animation - reflex-backend-wai - - reflex-basic-host - - reflex-dom-core - reflex-dom-svg - reflex-gloss - reflex-gloss-scene @@ -8219,9 +8023,7 @@ broken-packages: - reified-records - reify - relacion - - relation - relational-postgresql8 - - relational-record-examples - relative-date - reload - remark @@ -8241,7 +8043,6 @@ broken-packages: - repa-flow - repa-linear-algebra - repa-plugin - - repa-scalar - repa-series - repa-stream - repa-v4l2 @@ -8301,13 +8102,8 @@ broken-packages: - rfc-redis - rfc-servant - rfc1413-server - - rhine - - rhine-gloss - rhythm-game-tutorial - - ribosome - RichConditional - - ridley - - ridley-extras - riemann - riff - ring-buffer @@ -8333,14 +8129,12 @@ broken-packages: - RNAFoldProgs - RNAlien - RNAwolf - - rncryptor - rng-utils - rob - robin - robots-txt - roc-cluster - roc-cluster-demo - - rocksdb-query - roku-api - rollbar-hs - roller @@ -8370,7 +8164,6 @@ broken-packages: - rspp - rss-conduit - rss2irc - - rtnetlink - rtorrent-rpc - rts-loader - ruby-marshal @@ -8394,11 +8187,6 @@ broken-packages: - safe-json - safe-lazy-io - safe-length - - safe-money - - safe-money-aeson - - safe-money-cereal - - safe-money-serialise - - safe-money-store - safe-money-xmlbf - safe-plugins - safe-printf @@ -8411,7 +8199,6 @@ broken-packages: - saferoute - sai-shape-syb - sajson - - salak - salak-toml - salak-yaml - Salsa @@ -8456,7 +8243,6 @@ broken-packages: - scenegraph - schedevr - schedule-planner - - scheduler - schedyield - schematic - scholdoc @@ -8464,6 +8250,7 @@ broken-packages: - scholdoc-texmath - scholdoc-types - SciBaseTypes + - scidb-hquery - science-constants-dimensional - SciFlow - SciFlow-drmaa @@ -8515,21 +8302,18 @@ broken-packages: - SelectSequencesFromMSA - selenium - selenium-server - - self-extract - selinux - Semantique - semdoc - semi-iso - semialign - semialign-indexed - - semibounded-lattices - Semigroup - semigroupoids-syntax - semigroups-actions - semilattices - semiring - semiring-num - - semver-range - sendgrid-haskell - sendgrid-v3 - sensei @@ -8582,7 +8366,6 @@ broken-packages: - servant-pool - servant-postgresql - servant-proto-lens - - servant-purescript - servant-pushbullet-client - servant-py - servant-quickcheck @@ -8667,7 +8450,6 @@ broken-packages: - shorten-strings - ShortestPathProblems - showdown - - shower - shpider - shuffle - si-clock @@ -8675,7 +8457,6 @@ broken-packages: - sifflet - sifflet-lib - sigma-ij - - sign - signals - signed-multiset - silvi @@ -8708,7 +8489,6 @@ broken-packages: - simple-tabular - simple-tar - simple-templates - - simple-ui - simple-units - simple-vec3 - simple-zipper @@ -8721,7 +8501,6 @@ broken-packages: - simplenote - simpleprelude - SimpleServer - - simplest-sqlite - simseq - singleton-dict - singleton-typelits @@ -8758,7 +8537,6 @@ broken-packages: - slug - small-bytearray-builder - smallarray - - smallcaps - smallcheck-laws - smallcheck-lens - smallpt-hs @@ -8792,7 +8570,6 @@ broken-packages: - snap-configuration-utilities - snap-error-collector - snap-extras - - snap-language - snap-routes - snap-stream - snap-testing @@ -8892,7 +8669,6 @@ broken-packages: - sparsecheck - sparser - spata - - spatial-rotations - special-functors - special-keys - specialize-th @@ -8916,10 +8692,7 @@ broken-packages: - splot - Spock - Spock-api-ghcjs - - Spock-api-server - Spock-auth - - Spock-core - - Spock-digestive - Spock-lucid - Spock-worker - spoonutil @@ -8940,6 +8713,7 @@ broken-packages: - sqlvalue-list - sqsd-local - squeal-postgresql + - squeeze - srcinst - sscan - sscgi @@ -8978,7 +8752,6 @@ broken-packages: - stackage-upload - stackage2nix - standalone-derive-topdown - - standalone-haddock - starling - stash - Stasis @@ -8999,9 +8772,7 @@ broken-packages: - statsd - statsd-client - statsdi - - staversion - stb-image-redux - - stb-truetype - stdata - stdf - stdio @@ -9011,13 +8782,11 @@ broken-packages: - stemmer-german - stepwise - stgi - - STL - stm-chunked-queues - stm-containers - stm-firehose - stm-hamt - stm-io-hooks - - stm-lifted - stm-promise - stm-stats - stmcontrol @@ -9043,12 +8812,9 @@ broken-packages: - streamed - streaming-brotli - streaming-cassava - - streaming-concurrency - streaming-conduit - streaming-fft - streaming-lzma - - streaming-osm - - streaming-pcap - streaming-png - streaming-postgresql-simple - streaming-process @@ -9067,7 +8833,6 @@ broken-packages: - stripe-haskell - stripe-http-client - stripe-http-streams - - strongswan-sql - structural-induction - structural-traversal - structured-mongoDB @@ -9080,7 +8845,6 @@ broken-packages: - subleq-toolchain - submark - subsample - - substring-parser - subwordgraph - successors - suffix-array @@ -9110,8 +8874,8 @@ broken-packages: - SVD2HS - svfactor - svg-builder-fork - - SVG2Q - svg2q + - SVG2Q - svgutils - svm-simple - svndump @@ -9130,7 +8894,6 @@ broken-packages: - sym-plot - symantic - symantic-cli - - symantic-grammar - symantic-http-test - symantic-lib - symengine @@ -9138,7 +8901,6 @@ broken-packages: - sync - sync-mht - syncthing-hs - - syntactic - syntax - syntax-attoparsec - syntax-example @@ -9165,11 +8927,10 @@ broken-packages: - t3-server - ta - table - - table-layout - table-tennis - tableaux - - Tables - tables + - Tables - tablestorage - Tablify - tabloid @@ -9211,7 +8972,6 @@ broken-packages: - tasty-jenkins-xml - tasty-laws - tasty-lens - - tasty-quickcheck-laws - tasty-stats - tasty-tap - tasty-travis @@ -9257,7 +9017,6 @@ broken-packages: - terminal-punch - terminal-text - termination-combinators - - termonad - termplot - terntup - terrahs @@ -9323,7 +9082,6 @@ broken-packages: - th-typegraph - thank-you-stars - theatre - - themoviedb - thentos-cookie-session - Theora - theoremquest @@ -9335,14 +9093,12 @@ broken-packages: - Thingie - thorn - threadmanager - - threads-supervisor - threadscope - threepenny-gui-contextmenu - threepenny-gui-flexbox - thrift - throttled-io-loop - through-text - - throwable-exceptions - thumbnail-plus - tic-tac-toe - tickle @@ -9361,7 +9117,6 @@ broken-packages: - time-http - time-io-access - time-machine - - time-parsers - time-quote - time-recurrence - time-series @@ -9400,7 +9155,6 @@ broken-packages: - to-string-class - to-string-instances - toboggan - - todo - todos - tofromxml - toilet @@ -9414,8 +9168,8 @@ broken-packages: - tomland - too-many-cells - toodles - - Top - top + - Top - topkata - torch - TORCS @@ -9433,9 +9187,7 @@ broken-packages: - trace-function-call - traced - tracetree - - tracing - tracker - - trackit - traction - tracy - traildb @@ -9456,10 +9208,6 @@ broken-packages: - translatable-intset - translate - translate-cli - - trasa - - trasa-client - - trasa-server - - trasa-th - travis - travis-meta-yaml - trawl @@ -9489,7 +9237,6 @@ broken-packages: - tries - trigger - trimpolya - - triplesec - tripLL - trivia - tropical @@ -9520,7 +9267,6 @@ broken-packages: - twee - tweet-hs - twentefp-eventloop-graphics - - twentefp-eventloop-trees - twentefp-graphs - twentefp-rosetree - twentefp-trees @@ -9599,7 +9345,6 @@ broken-packages: - unagi-bloomfilter - unagi-streams - unamb-custom - - unbeliever - unbound - unbounded-delays-units - unboxed-containers @@ -9641,7 +9386,6 @@ broken-packages: - unsequential - unused - uom-plugin - - up - update-nix-fetchgit - Updater - uploadcare @@ -9661,7 +9405,6 @@ broken-packages: - urldecode - UrlDisp - urldisp-happstack - - urlpath - URLT - urn - urn-random @@ -9687,6 +9430,7 @@ broken-packages: - uuagc-bootstrap - uuagc-diagrams - uuid-aeson + - uuid-orphans - uvector - uvector-algorithms - uxadt @@ -9697,7 +9441,6 @@ broken-packages: - vacuum-graphviz - vacuum-opengl - vacuum-ubigraph - - vado - valid-names - validate-input - validated-literals @@ -9711,7 +9454,6 @@ broken-packages: - variable-precision - variables - variation - - vault-tool - vault-tool-server - vault-trans - vaultaire-common @@ -9720,7 +9462,6 @@ broken-packages: - vcf - vcsgui - vcswrapper - - vec - Vec-Boolean - Vec-OpenGLRaw - Vec-Transform @@ -9731,7 +9472,6 @@ broken-packages: - vector-clock - vector-conduit - vector-endian - - vector-extras - vector-functorlazy - vector-heterogenous - vector-instances-collections @@ -9749,7 +9489,6 @@ broken-packages: - verilog - versioning - versioning-servant - - vflow-types - vfr-waypoints - vgrep - vhd @@ -9759,7 +9498,6 @@ broken-packages: - views - vigilance - Villefort - - vimeta - vimus - vintage-basic - vinyl-json @@ -9789,7 +9527,6 @@ broken-packages: - vty-ui - vty-ui-extras - vulkan - - vulkan-api - waargonaut - wacom-daemon - waddle @@ -9824,7 +9561,6 @@ broken-packages: - wai-request-spec - wai-responsible - wai-router - - wai-routes - wai-routing - wai-secure-cookies - wai-session-alt @@ -9879,12 +9615,12 @@ broken-packages: - webfinger-client - webify - webkit-javascriptcore - - webkit2gtk3-javascriptcore - Webrexp - webserver - webshow - websockets-rpc - webwire + - weekdaze - weighted - weighted-regexp - welshy @@ -9899,7 +9635,6 @@ broken-packages: - whiskers - whitespace - why3 - - wide-word - WikimediaParser - wikipedia4epub - wild-bind-indicator @@ -9911,7 +9646,6 @@ broken-packages: - Wired - wires - wiring - - withdependencies - wkt - wkt-geom - wl-pprint-ansiterm @@ -9948,8 +9682,6 @@ broken-packages: - writer-cps-lens - writer-cps-monads-tf - writer-cps-morph - - ws - - ws-chans - wsdl - wsedit - wss-client @@ -10014,7 +9746,6 @@ broken-packages: - xml2x - xmlbf-xmlhtml - XmlHtmlWriter - - XMLParser - xmltv - XMMS - xmms2-client @@ -10049,8 +9780,6 @@ broken-packages: - yahoo-web-search - yajl - yajl-enumerator - - yam - - yam-datasource - yam-job - yam-redis - yam-servant @@ -10079,7 +9808,6 @@ broken-packages: - yate - yavie - yaya - - yaya-hedgehog - yaya-unsafe - ycextra - yeller @@ -10113,7 +9841,6 @@ broken-packages: - yesod-dsl - yesod-examples - yesod-fast-devel - - yesod-fay - yesod-form-richtext - yesod-gitrev - yesod-goodies @@ -10124,7 +9851,6 @@ broken-packages: - yesod-mangopay - yesod-paginate - yesod-pagination - - yesod-paginator - yesod-paypal-rest - yesod-platform - yesod-pnotify @@ -10202,7 +9928,6 @@ broken-packages: - zeromq4-clone-pattern - zeromq4-conduit - zeromq4-patterns - - zeromq4-simple - zeroth - ZFS - zifter @@ -10232,7 +9957,5 @@ broken-packages: - zre - zsh-battery - zsyntax - - ztar - zuramaru - Zwaluw - - zxcvbn-c -- cgit 1.4.1 From b55a32a8ad6301d7d5b45871e54ad8bdcf4c547d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 7 Jul 2019 13:11:07 +0200 Subject: hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.4 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/7e06c671c3b104e512d586095612455e2fa6a231. --- .../haskell-modules/hackage-packages.nix | 1186 ++++++++------------ 1 file changed, 472 insertions(+), 714 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 60a805ad430a..c7443a42e5b6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1111,16 +1111,14 @@ self: { pname = "AspectAG"; version = "0.5.0.0"; sha256 = "039k40swscsg21b4k4a3q95migvkflcp7sgx2a8gpzanrkx3ckz2"; - revision = "1"; - editedCabalFile = "0w5hlvwgwank3a930f4vcb0j966c6d0818lsp4rh85rjg5n9x7r7"; + revision = "2"; + editedCabalFile = "1afrgn3hhkfrb3khfnbj7x9p4dh8j682zjhp5lc7s7syr8zp8pxy"; libraryHaskellDepends = [ base containers ghc-prim mtl tagged template-haskell th-strict-compat ]; description = "Strongly typed Attribute Grammars implemented using type-level programming"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "AttoBencode" = callPackage @@ -4542,8 +4540,6 @@ self: { testHaskellDepends = [ base containers MonadRandom ]; description = "A Haskell library for probability distributions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "DistanceTransform" = callPackage @@ -4898,8 +4894,6 @@ self: { ]; description = "Auto Korean conjugator/adjustor/adopter/converter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Earley" = callPackage @@ -6595,8 +6589,6 @@ self: { ]; description = "Typesafe functional GPU graphics programming"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "GPipe-Collada" = callPackage @@ -9690,8 +9682,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "A library for arbitrary precision decimal numbers"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "HasCacBDD" = callPackage @@ -11129,8 +11119,6 @@ self: { libraryHaskellDepends = [ base parsec ]; description = "Parse JSON"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "JSONb" = callPackage @@ -13986,8 +13974,6 @@ self: { testHaskellDepends = [ base ]; description = "Remove all the functions come from Debug.Trace after debugging"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Noise" = callPackage @@ -17078,8 +17064,6 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring cereal text ]; description = "STL 3D geometry format parsing and pretty-printing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "STLinkUSB" = callPackage @@ -18150,8 +18134,6 @@ self: { libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ]; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Spock-auth" = callPackage @@ -18193,8 +18175,6 @@ self: { ]; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Spock-digestive" = callPackage @@ -18211,8 +18191,6 @@ self: { ]; description = "Digestive functors support for Spock"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Spock-lucid" = callPackage @@ -20578,8 +20556,6 @@ self: { libraryHaskellDepends = [ base parsec ]; description = "A library to parse xml"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "XMMS" = callPackage @@ -21575,8 +21551,6 @@ self: { ]; description = "Accelerate backend component generating LLVM IR"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "accelerate-llvm-native" = callPackage @@ -23250,8 +23224,6 @@ self: { ]; description = "Extra goodies for aeson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aeson-extra_0_4_1_2" = callPackage @@ -23281,7 +23253,6 @@ self: { description = "Extra goodies for aeson"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aeson-filthy" = callPackage @@ -25917,8 +25888,6 @@ self: { ]; description = "Amazon Cognito Identity SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cognito-idp" = callPackage @@ -26272,8 +26241,6 @@ self: { ]; description = "Amazon EC2 Container Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-efs" = callPackage @@ -27902,6 +27869,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "amqp_0_18_3" = callPackage + ({ mkDerivation, base, binary, bytestring, clock, connection + , containers, data-binary-ieee754, hspec, hspec-expectations + , monad-control, network, network-uri, split, stm, text, vector + , xml + }: + mkDerivation { + pname = "amqp"; + version = "0.18.3"; + sha256 = "1cyzazl3hz5yd2i220b4g8xs0fm47xqlwyvgarxbnn5gnrm8ys21"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring clock connection containers + data-binary-ieee754 monad-control network network-uri split stm + text vector + ]; + executableHaskellDepends = [ base containers xml ]; + testHaskellDepends = [ + base binary bytestring clock connection containers + data-binary-ieee754 hspec hspec-expectations network network-uri + split stm text vector + ]; + description = "Client library for AMQP servers (currently only RabbitMQ)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "amqp-conduit" = callPackage ({ mkDerivation, amqp, base, bytestring, conduit, exceptions, hspec , HUnit, lifted-base, monad-control, mtl, resourcet, text @@ -32133,8 +32128,6 @@ self: { ]; description = "A modified version of async that supports worker groups and many-to-many task dependencies"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "async-refresh" = callPackage @@ -32898,8 +32891,6 @@ self: { ]; description = "Parse IP data types with attoparsec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "attoparsec-iso8601" = callPackage @@ -33043,8 +33034,6 @@ self: { ]; description = "URI parser / printer using attoparsec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "attoparsec-varword" = callPackage @@ -33390,6 +33379,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "auto-update_0_1_6" = callPackage + ({ mkDerivation, base, exceptions, hspec, HUnit, retry }: + mkDerivation { + pname = "auto-update"; + version = "0.1.6"; + sha256 = "1i36xc2i34aync8271x3pv515l3zb53i518dybn8ghqkhzf27q7l"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base exceptions hspec HUnit retry ]; + description = "Efficiently run periodic, on-demand actions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "autoexporter" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { @@ -36435,8 +36437,6 @@ self: { ]; description = "Connection layer between beam and postgres"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "beam-sqlite" = callPackage @@ -36923,8 +36923,6 @@ self: { ]; description = "A horizontal version of tetris for braille users"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "between" = callPackage @@ -37008,8 +37006,6 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring time ]; description = "Parse BgMax-files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bgzf" = callPackage @@ -38923,8 +38919,6 @@ self: { ]; description = "Aggregate continuous values into discrete bins"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bio" = callPackage @@ -39297,6 +39291,8 @@ self: { ]; description = "Plays chess"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bit-array" = callPackage @@ -41117,14 +41113,14 @@ self: { }) {}; "board-games" = callPackage - ({ mkDerivation, array, base, cgi, containers, html, httpd-shed - , network-uri, non-empty, QuickCheck, random, transformers - , utility-ht + ({ mkDerivation, array, base, cgi, containers, criterion, html + , httpd-shed, network-uri, non-empty, QuickCheck, random + , transformers, utility-ht }: mkDerivation { pname = "board-games"; - version = "0.2"; - sha256 = "1plgnwlpx0bw0wjwd0dxbh616vy37frclwir692x1fr2lq85y98c"; + version = "0.2.1"; + sha256 = "1gsbk1m58f82b1ic0fv1ygslz4lyxxdl0a849q5hl4qbl9s7rbqb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41139,6 +41135,9 @@ self: { array base containers non-empty QuickCheck random transformers utility-ht ]; + benchmarkHaskellDepends = [ + base containers criterion non-empty utility-ht + ]; description = "Three games for inclusion in a web server"; license = "GPL"; }) {}; @@ -41678,14 +41677,14 @@ self: { pname = "boring"; version = "0.1.2"; sha256 = "0978dq53rpb7clz1ydjm6x38nrx0vkp3safqcbjp2kq6jlaz29jr"; + revision = "1"; + editedCabalFile = "010k2mw8q3iby78ak56xamp6pzdwijn92r64r76hblw32k1i80c0"; libraryHaskellDepends = [ adjunctions base base-compat constraints dec fin generics-sop singleton-bool streams tagged transformers transformers-compat vec ]; description = "Boring and Absurd types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "boring-game" = callPackage @@ -41803,8 +41802,6 @@ self: { ]; description = "ScopeH and ScopeT extras for bound"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bound-gen" = callPackage @@ -42381,8 +42378,6 @@ self: { benchmarkHaskellDepends = [ async base criterion deepseq stm ]; description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "broadcast-chan-conduit" = callPackage @@ -43678,6 +43673,8 @@ self: { libraryHaskellDepends = [ base primitive primitive-addr ]; description = "Slicing managed and unmanaged memory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytestring_0_10_8_2" = callPackage @@ -43715,8 +43712,6 @@ self: { ]; description = "Arbitrary instances for ByteStrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bytestring-builder" = callPackage @@ -44838,8 +44833,6 @@ self: { doCheck = false; description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cabal-info" = callPackage @@ -45881,8 +45874,6 @@ self: { ]; description = "A library implementing the Noise protocol"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "caf" = callPackage @@ -46366,8 +46357,6 @@ self: { libraryHaskellDepends = [ arithmoi array base containers random ]; description = "Arithmetic for Psychedelically Large Numbers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "canonical-filepath" = callPackage @@ -46603,8 +46592,6 @@ self: { ]; description = "Extensional capabilities and deriving combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "capataz" = callPackage @@ -47497,8 +47484,6 @@ self: { ]; description = "io-streams interface for the cassava CSV library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cassette" = callPackage @@ -53482,8 +53467,6 @@ self: { libraryHaskellDepends = [ accelerate base ]; description = "Working with colours in Accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "colour-space" = callPackage @@ -53807,8 +53790,6 @@ self: { ]; description = "Arrays where the index type is a function of the shape type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "comfort-graph" = callPackage @@ -53843,8 +53824,6 @@ self: { ]; description = "A format for describing comics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "comma" = callPackage @@ -54437,8 +54416,6 @@ self: { ]; description = "Monad for allocation and cleanup of application resources"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "componentm-devel" = callPackage @@ -54452,8 +54429,6 @@ self: { ]; description = "Easy REPL driven development using ComponentM"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "composable-associations" = callPackage @@ -55897,8 +55872,6 @@ self: { libraryHaskellDepends = [ base conduit mtl ]; description = "Merge multiple sorted conduits"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "conduit-network-stream" = callPackage @@ -56026,8 +55999,6 @@ self: { ]; description = "Virtual file system for Conduit; disk, pure, and in-memory impls"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "conduit-vfs-zip" = callPackage @@ -56054,8 +56025,6 @@ self: { ]; description = "Zip archive interface for the Conduit Virtual File System"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "conduit-zstd" = callPackage @@ -56143,8 +56112,6 @@ self: { text transformers ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "confcrypt_0_2_3_3" = callPackage @@ -56181,7 +56148,6 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "confetti" = callPackage @@ -56723,8 +56689,6 @@ self: { ]; description = "Interpret the command line and a config file as commands and options"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "console-prompt" = callPackage @@ -57002,8 +56966,6 @@ self: { executableHaskellDepends = [ aeson base constraints ]; description = "Utility package for constraints"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "constrictor" = callPackage @@ -57498,8 +57460,6 @@ self: { testHaskellDepends = [ base containers stm time ]; description = "Event scheduling system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "control-iso" = callPackage @@ -57959,8 +57919,6 @@ self: { ]; description = "A stream DSL for writing embedded C programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "copilot-c99" = callPackage @@ -57978,8 +57936,6 @@ self: { ]; description = "A compiler for Copilot targeting C99"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "copilot-cbmc" = callPackage @@ -58011,8 +57967,6 @@ self: { ]; description = "An intermediate representation for Copilot"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "copilot-language" = callPackage @@ -58029,8 +57983,6 @@ self: { ]; description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "copilot-libraries" = callPackage @@ -58046,8 +57998,6 @@ self: { ]; description = "Libraries for the Copilot language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "copilot-sbv" = callPackage @@ -58082,8 +58032,6 @@ self: { ]; description = "k-induction for Copilot"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "copr" = callPackage @@ -60668,8 +60616,6 @@ self: { ]; description = "a gallery of Csound instruments"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "csound-expression" = callPackage @@ -61306,8 +61252,6 @@ self: { testHaskellDepends = [ base directory hspec hspec-expectations ]; description = "A framework for declaratively writing curl based API tests"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "curlhs" = callPackage @@ -61691,8 +61635,6 @@ self: { ]; description = "A subfield of the complex numbers for exact calculation"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cypher" = callPackage @@ -63308,8 +63250,6 @@ self: { ]; description = "Interval datatype, interval arithmetic and interval-based containers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "data-inttrie" = callPackage @@ -67065,8 +67005,6 @@ self: { ]; description = "Type, render and parse the df1 hierarchical structured log format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dfinity-radix-tree" = callPackage @@ -67458,8 +67396,6 @@ self: { ]; description = "Compile Dhall expressions to Cabal files"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dhcp-lease-parser" = callPackage @@ -67495,8 +67431,6 @@ self: { ]; description = "Typeful hierarchical structured logging using di, mtl and df1"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "di-core" = callPackage @@ -67535,8 +67469,6 @@ self: { ]; description = "Write logs in the df1 format using the di logging framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "di-handle" = callPackage @@ -67550,8 +67482,6 @@ self: { ]; description = "IO support for file handles in di-core"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "di-monad" = callPackage @@ -69747,8 +69677,6 @@ self: { testHaskellDepends = [ base binary hspec QuickCheck ]; description = "Serializable closures for distributed programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "distributed-fork" = callPackage @@ -69767,8 +69695,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit unix ]; description = "Like 'forkIO', but uses remote machines instead of local threads"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "distributed-fork-aws-lambda" = callPackage @@ -70594,6 +70520,8 @@ self: { ]; description = "Fedora image download tool"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dlist" = callPackage @@ -70973,8 +70901,6 @@ self: { ]; description = "An API client for docker written in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "docker-build-cacher" = callPackage @@ -72421,8 +72347,6 @@ self: { libraryHaskellDepends = [ base parsec ]; description = "Haskell Doge Serialized Object Notation Parser"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dson-parsec" = callPackage @@ -73575,8 +73499,6 @@ self: { ]; description = "Pure, type-indexed haskell vector, matrix, and tensor library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "easytensor-vulkan" = callPackage @@ -73588,8 +73510,6 @@ self: { libraryHaskellDepends = [ base dimensions easytensor vulkan-api ]; description = "Use easytensor with vulkan-api"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "easytest" = callPackage @@ -74170,14 +74090,16 @@ self: { }) {}; "effect-stack" = callPackage - ({ mkDerivation, base, transformers }: + ({ mkDerivation, base, constraints, mtl, transformers }: mkDerivation { pname = "effect-stack"; - version = "0.1.0.1"; - sha256 = "0w68nz93k7i5qg9ihqzasm0gsjy0v0ggjilq7pwqdf7mxx1pj1p3"; - libraryHaskellDepends = [ base transformers ]; + version = "0.2.1"; + sha256 = "0sram572nbzpgwb3vi5fmg2f4ynsh693q05w0n5yjj8zl4a7p4ds"; + libraryHaskellDepends = [ base constraints mtl transformers ]; description = "Reducing the pain of transformer stacks with duplicated effects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "effective-aspects" = callPackage @@ -74231,8 +74153,6 @@ self: { libraryHaskellDepends = [ base containers newtype-generics void ]; description = "Computational Effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "effects-parser" = callPackage @@ -74244,8 +74164,6 @@ self: { libraryHaskellDepends = [ base effects ]; description = "Parser Effect for the Control.Effects Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "effin" = callPackage @@ -74684,8 +74602,6 @@ self: { testHaskellDepends = [ base ]; description = "Easily expose your EKG metrics to Prometheus"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ekg-push" = callPackage @@ -75364,8 +75280,6 @@ self: { testHaskellDepends = [ base directory filepath tasty tasty-hunit ]; description = "A tiny language for understanding the lambda-calculus"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "emacs-keys" = callPackage @@ -75515,8 +75429,6 @@ self: { ]; description = "Perform basic syntax and deliverability checks on email addresses"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "emailaddress" = callPackage @@ -75642,8 +75554,6 @@ self: { testHaskellDepends = [ base containers HUnit ]; description = "Empirical Mode Decomposition and Hilbert-Huang Transform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "emgm" = callPackage @@ -78035,8 +77945,6 @@ self: { ]; description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "eventsource-api" = callPackage @@ -78377,8 +78285,6 @@ self: { libraryHaskellDepends = [ base template-haskell ]; description = "Exception type hierarchy with TemplateHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "exception-mailer" = callPackage @@ -79289,6 +79195,18 @@ self: { broken = true; }) {}; + "extend-record-data-th" = callPackage + ({ mkDerivation, attoparsec, base, template-haskell, text }: + mkDerivation { + pname = "extend-record-data-th"; + version = "0.1.0.2"; + sha256 = "1gy730iic17hiiqf08j4riz1086wpz6iv7i5carc04mi39zdjf4h"; + libraryHaskellDepends = [ attoparsec base template-haskell text ]; + testHaskellDepends = [ attoparsec base template-haskell text ]; + description = "TH to define a new record data type that extends the existing record data type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "extended-categories" = callPackage ({ mkDerivation, base, constraints, ghc-prim, tagged }: mkDerivation { @@ -79418,8 +79336,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Message passing concurrency as extensible-effect"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "extensible-exceptions" = callPackage @@ -79648,6 +79564,8 @@ self: { ]; description = "Rational arithmetic in an irrational world"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "facts" = callPackage @@ -79858,8 +79776,6 @@ self: { testHaskellDepends = [ base hspec random text time ]; description = "Randomly generated fake data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fake-type" = callPackage @@ -80351,8 +80267,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "A fast, but bare bones, bytestring parser combinators library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fastpbkdf2" = callPackage @@ -80449,8 +80363,6 @@ self: { executableHaskellDepends = [ base mtl optparse-applicative split ]; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fay-base" = callPackage @@ -80463,8 +80375,6 @@ self: { libraryHaskellDepends = [ base fay ]; description = "The base package for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fay-builder" = callPackage @@ -80498,8 +80408,6 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "DOM FFI wrapper library for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fay-geoposition" = callPackage @@ -80512,8 +80420,6 @@ self: { libraryHaskellDepends = [ fay-base fay-text ]; description = "W3C compliant implementation of GeoPosition API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fay-hsx" = callPackage @@ -80540,8 +80446,6 @@ self: { libraryHaskellDepends = [ fay-base fay-text ]; description = "jQuery bindings for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fay-ref" = callPackage @@ -80554,8 +80458,6 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "Like IORef but for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fay-simplejson" = callPackage @@ -80584,8 +80486,6 @@ self: { libraryHaskellDepends = [ fay fay-base text ]; description = "Fay Text type represented as JavaScript strings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fay-uri" = callPackage @@ -80598,8 +80498,6 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "Persistent FFI bindings for using jsUri in Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fay-websockets" = callPackage @@ -80612,8 +80510,6 @@ self: { libraryHaskellDepends = [ fay-base ]; description = "Websockets FFI library for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fb" = callPackage @@ -82289,8 +82185,21 @@ self: { testHaskellDepends = [ base inspection-testing tagged ]; description = "Nat and Fin: peano naturals and finite numbers"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "fin_0_1" = callPackage + ({ mkDerivation, base, dec, deepseq, hashable, inspection-testing + , tagged + }: + mkDerivation { + pname = "fin"; + version = "0.1"; + sha256 = "17nv26cznhslrfb1ajcgxa9g3zacvk3prmncr7f8d7rvh42g2gnn"; + libraryHaskellDepends = [ base dec deepseq hashable ]; + testHaskellDepends = [ base inspection-testing tagged ]; + description = "Nat and Fin: peano naturals and finite numbers"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "final" = callPackage @@ -82647,6 +82556,8 @@ self: { ]; description = "Calculates file-size frequency-distribution"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fit" = callPackage @@ -84211,6 +84122,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fmlist_0_9_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "fmlist"; + version = "0.9.3"; + sha256 = "1w9nhm2zybdx4c1lalkajwqr8wcs731lfjld2r8gknd7y96x8pwf"; + libraryHaskellDepends = [ base ]; + description = "FoldMap lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fmt" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, call-stack , containers, criterion, deepseq, doctest, doctest-discover @@ -86383,8 +86306,6 @@ self: { ]; description = "Attempt to pretty-print any input"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "friendly-time" = callPackage @@ -86455,8 +86376,6 @@ self: { ]; description = "A reactive frontend web framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "frontmatter" = callPackage @@ -86946,8 +86865,6 @@ self: { ]; description = "In-memory full text search engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fullstop" = callPackage @@ -88878,8 +88795,6 @@ self: { ]; description = "Derivation of Aeson instances using GHC generics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "generic-arbitrary" = callPackage @@ -89064,6 +88979,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-lens_1_2_0_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, doctest, HUnit + , inspection-testing, lens, profunctors, QuickCheck, tagged, text + }: + mkDerivation { + pname = "generic-lens"; + version = "1.2.0.0"; + sha256 = "0qf49s01xkbhlfclc4a3ybhhf65g6mmigkkqj2psdjndgjdaxhb2"; + libraryHaskellDepends = [ base profunctors tagged text ]; + testHaskellDepends = [ + base doctest HUnit inspection-testing lens profunctors + ]; + benchmarkHaskellDepends = [ + base criterion deepseq lens QuickCheck + ]; + description = "Generically derive traversals, lenses and prisms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-lens-labels" = callPackage ({ mkDerivation, base, generic-lens }: mkDerivation { @@ -89272,8 +89207,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "A library for generic programming that aims to be easy to understand"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "generics-mrsop" = callPackage @@ -90715,8 +90648,6 @@ self: { ]; description = "An AST and compiler plugin for dumping GHC's Core representation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ghc-dump-tree" = callPackage @@ -90766,8 +90697,6 @@ self: { ]; description = "Handy tools for working with @ghc-dump@ dumps"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ghc-dup" = callPackage @@ -91926,8 +91855,6 @@ self: { ]; description = "DOM library that supports both GHCJS and GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ghcjs-dom-hello" = callPackage @@ -91962,8 +91889,6 @@ self: { doHaddock = false; description = "DOM library that supports both GHCJS and GHC using jsaddle"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ghcjs-dom-jsffi" = callPackage @@ -93651,8 +93576,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20190626"; - sha256 = "1xjywj2hn40cqwvdh8iaixgx9iscgnsmrwkn3xrlz7gjw858n3lv"; + version = "7.20190708"; + sha256 = "18s563swrp8mx479995pdhhmn40y3xwlbm1z3w63qsnjqmj7zlij"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -93902,8 +93827,6 @@ self: { ]; description = "Passively snapshots working tree changes efficiently"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "git-object" = callPackage @@ -94552,8 +94475,6 @@ self: { ]; description = "Libgit2 backend for gitlib"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gitlib-s3" = callPackage @@ -94616,8 +94537,6 @@ self: { ]; description = "Test library for confirming gitlib backend compliance"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gitlib-utils" = callPackage @@ -94695,8 +94614,6 @@ self: { ]; description = "Gitter.im API client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "givegif" = callPackage @@ -95160,8 +95077,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Console IRC client"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gll" = callPackage @@ -95334,8 +95249,6 @@ self: { libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gloss-algorithms" = callPackage @@ -95580,8 +95493,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "glue-core" = callPackage @@ -95606,8 +95517,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "glue-ekg" = callPackage @@ -95632,8 +95541,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "glue-example" = callPackage @@ -95654,8 +95561,6 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gluturtle" = callPackage @@ -98553,8 +98458,6 @@ self: { ]; description = "proxy gopher over http"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gopherbot" = callPackage @@ -100501,8 +100404,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Grouped lists. Equal consecutive elements are grouped."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "groupoid" = callPackage @@ -103096,7 +102997,6 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haddock_2_17_5" = callPackage @@ -103114,7 +103014,6 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haddock" = callPackage @@ -103131,8 +103030,6 @@ self: { preCheck = "unset GHC_PACKAGE_PATH"; description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haddock-api_2_15_0_2" = callPackage @@ -103152,7 +103049,6 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haddock-api_2_16_1" = callPackage @@ -103172,7 +103068,6 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haddock-api_2_17_4" = callPackage @@ -103195,7 +103090,6 @@ self: { description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haddock-api" = callPackage @@ -103221,8 +103115,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haddock-cheatsheet" = callPackage @@ -104042,8 +103934,6 @@ self: { ]; description = "Allow Hakyll to create hierarchical menues from directories"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hakyll-elm" = callPackage @@ -104072,8 +103962,6 @@ self: { executableHaskellDepends = [ base hakyll ]; testHaskellDepends = [ base ]; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hakyll-filestore" = callPackage @@ -104113,8 +104001,6 @@ self: { ]; description = "Hakyll utilities to work with images"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hakyll-ogmarkup" = callPackage @@ -104143,8 +104029,6 @@ self: { ]; description = "Hakyll SASS compiler over hsass"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hakyll-series" = callPackage @@ -104156,8 +104040,6 @@ self: { libraryHaskellDepends = [ base containers hakyll ]; description = "Adds series functionality to hakyll"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hakyll-shakespeare" = callPackage @@ -104175,8 +104057,6 @@ self: { ]; description = "Hakyll Hamlet compiler"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hakyll-shortcode" = callPackage @@ -106030,8 +105910,6 @@ self: { libraryHaskellDepends = [ base QuickCheck ]; description = "Entity based records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "has-th" = callPackage @@ -107251,8 +107129,6 @@ self: { testHaskellDepends = [ base ]; description = "A program to find and display the docs and type of a name"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskell-eigen-util" = callPackage @@ -107835,8 +107711,6 @@ self: { ]; description = "Name resolution library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskell-names_0_9_6" = callPackage @@ -107861,7 +107735,6 @@ self: { description = "Name resolution library for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskell-neo4j-client" = callPackage @@ -112658,8 +112531,6 @@ self: { testHaskellDepends = [ base containers mtl ]; description = "Haskell docs tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hdph" = callPackage @@ -114736,8 +114607,6 @@ self: { ]; description = "Heyting and Boolean algebras"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hfann" = callPackage @@ -115343,8 +115212,6 @@ self: { ]; description = "Happy Haskell Programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hi" = callPackage @@ -115698,8 +115565,6 @@ self: { ]; description = "Partial types as a type constructor"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "highWaterMark" = callPackage @@ -116262,6 +116127,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hint_0_9_0_1" = callPackage + ({ mkDerivation, base, containers, directory, exceptions + , extensible-exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit + , mtl, random, temporary, unix + }: + mkDerivation { + pname = "hint"; + version = "0.9.0.1"; + sha256 = "15cnam704p7ynk70lqz3nvy91src5bd9amfdknvkfzpi5yf2825b"; + libraryHaskellDepends = [ + base directory exceptions filepath ghc ghc-boot ghc-paths mtl + random temporary unix + ]; + testHaskellDepends = [ + base containers directory exceptions extensible-exceptions filepath + HUnit unix + ]; + description = "Runtime Haskell interpreter (GHC API wrapper)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hint-server" = callPackage ({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl }: @@ -117771,8 +117658,6 @@ self: { ]; description = "hmatrix operations lifted for backprop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hmatrix-banded" = callPackage @@ -118612,6 +118497,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hoauth2_1_8_8" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit + , http-types, microlens, text, unordered-containers, uri-bytestring + , uri-bytestring-aeson + }: + mkDerivation { + pname = "hoauth2"; + version = "1.8.8"; + sha256 = "0ji9887m11k3dh7n36g0m9q1gy4d4729ygvapdzqfa3vi501ndwa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring exceptions http-conduit http-types microlens + text unordered-containers uri-bytestring uri-bytestring-aeson + ]; + description = "Haskell OAuth2 authentication client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hob" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango @@ -121076,8 +120981,6 @@ self: { testHaskellDepends = [ base process tasty tasty-hunit ]; description = "File size in human readable format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hricket" = callPackage @@ -125265,8 +125168,8 @@ self: { }: mkDerivation { pname = "hssqlppp"; - version = "0.6.1"; - sha256 = "06rqf8gkz2f1ay1vd3ba0nzv9n1098vxm9sc9ls4dk2ismab7cgz"; + version = "0.6.2"; + sha256 = "0lzy6laqxi6v6hlz9j2kvxm9rc4i89m9lnffymfkfwxlrgq7wg0s"; libraryHaskellDepends = [ base containers mtl parsec pretty pretty-show syb text transformers uniplate @@ -125277,8 +125180,6 @@ self: { ]; description = "SQL parser and type checker"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hssqlppp-th" = callPackage @@ -125287,8 +125188,8 @@ self: { }: mkDerivation { pname = "hssqlppp-th"; - version = "0.6.1"; - sha256 = "09mxb2pmnk43bvdl7f58r8wxaw3h372sy174p42k8pphlss9amkg"; + version = "0.6.2"; + sha256 = "1p17srzz09iikxn47yr7qmv5g6z7c5kc5svlszmxlhs5j0kgahb0"; libraryHaskellDepends = [ base hssqlppp syb template-haskell text ]; @@ -125297,8 +125198,6 @@ self: { ]; description = "hssqlppp extras which need template-haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hstatistics" = callPackage @@ -128706,8 +128605,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generic finger-tree structure, with example instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hw-fingertree-strict" = callPackage @@ -128956,8 +128853,6 @@ self: { testHaskellDepends = [ base bytestring hw-prim lens vector ]; description = "SIMD-based JSON semi-indexer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hw-json-simple-cursor" = callPackage @@ -129005,8 +128900,8 @@ self: { }: mkDerivation { pname = "hw-json-standard-cursor"; - version = "0.2.1.0"; - sha256 = "0xn2a2xzvkvizjmrxd9zmmcizlc527mvnl45hvrzcijs1makar5g"; + version = "0.2.1.1"; + sha256 = "0z0lxzciyw6b49w1s88yx9lcqgk0fjmh1zv7qs3jnn9sk0bqldh5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129227,8 +129122,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Simple parser support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hw-prim" = callPackage @@ -129253,8 +129146,6 @@ self: { ]; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hw-prim_0_6_2_29" = callPackage @@ -129280,7 +129171,6 @@ self: { description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hw-prim-bits" = callPackage @@ -129301,8 +129191,6 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Primitive support for bit manipulation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hw-rankselect" = callPackage @@ -129540,8 +129428,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck vector ]; description = "Vector type with convenient typeclass instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hw-xml" = callPackage @@ -132263,6 +132149,8 @@ self: { ]; description = "A function to post an image to imgur"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "imgurder" = callPackage @@ -135113,8 +135001,6 @@ self: { ]; description = "EDSL for concurrent, realtime, embedded programming on top of Ivory"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ioref-stable" = callPackage @@ -136507,8 +136393,6 @@ self: { libraryToolDepends = [ alex happy ]; description = "Safe embedded C programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ivory-artifact" = callPackage @@ -136544,8 +136428,6 @@ self: { ]; description = "Ivory C backend"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ivory-bitdata" = callPackage @@ -136584,8 +136466,6 @@ self: { ]; description = "Simple concrete evaluator for Ivory programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ivory-examples" = callPackage @@ -136608,8 +136488,6 @@ self: { ]; description = "Ivory examples"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ivory-hw" = callPackage @@ -136622,8 +136500,6 @@ self: { libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; description = "Ivory hardware model (STM32F4)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ivory-opts" = callPackage @@ -136640,8 +136516,6 @@ self: { ]; description = "Ivory compiler optimizations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ivory-quickcheck" = callPackage @@ -136663,8 +136537,6 @@ self: { ]; description = "QuickCheck driver for Ivory"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ivory-serialize" = callPackage @@ -136681,8 +136553,6 @@ self: { ]; description = "Serialization library for Ivory"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ivory-stdlib" = callPackage @@ -136695,8 +136565,6 @@ self: { libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; description = "Ivory standard library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ivy-web" = callPackage @@ -137055,8 +136923,6 @@ self: { executableHaskellDepends = [ base boxes directory filepath ]; description = "Export sheet music and audio from Windows/Mac app Jammit"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "japanese-calendar" = callPackage @@ -137948,8 +137814,6 @@ self: { ]; description = "DOM library that uses jsaddle to support both GHCJS and GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "jsaddle-hello" = callPackage @@ -138888,6 +138752,8 @@ self: { ]; description = "Library to parse and execute JSONPath"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jsonresume" = callPackage @@ -139676,8 +139542,6 @@ self: { 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 @@ -140219,8 +140083,6 @@ self: { ]; description = "Fast concurrent queues much inspired by unagi-chan"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "kbq-gu" = callPackage @@ -140308,8 +140170,6 @@ self: { ]; description = "Fast and flexible k-d trees for various types of point queries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "keccak" = callPackage @@ -141683,8 +141543,6 @@ self: { testHaskellDepends = [ base ]; description = "Find the alpha emoji"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "kyotocabinet" = callPackage @@ -142049,8 +141907,6 @@ self: { ]; description = "Declarative command-line parser using type-driven pattern matching"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "lambda-placeholders" = callPackage @@ -144092,8 +143948,6 @@ self: { ]; description = "Auto-generated interface to Fortran LAPACK via comfort-array"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "lapack-ffi" = callPackage @@ -145118,8 +144972,6 @@ self: { ]; description = "Haskell code for learning physics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "learn-physics-examples" = callPackage @@ -145427,8 +145279,6 @@ self: { libraryHaskellDepends = [ accelerate base lens ]; description = "Instances to mix lens with accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "lens-action" = callPackage @@ -146309,8 +146159,6 @@ self: { librarySystemDepends = [ ffi ]; description = "LibFFI interface with dynamic bidirectional type-driven binding generation"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {ffi = null;}; "libgit" = callPackage @@ -146965,8 +146813,6 @@ self: { libraryPkgconfigDepends = [ systemd ]; description = "Haskell bindings to libsystemd-journal"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) systemd;}; "libtagc" = callPackage @@ -147745,8 +147591,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Lifting linear vector spaces into Accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "linear-algebra-cblas" = callPackage @@ -148551,7 +148395,6 @@ self: { description = "Demo of Liquid Haskell integration for Cabal and Stack"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "lispparser" = callPackage @@ -149348,8 +149191,6 @@ self: { ]; description = "General purpose LLVM bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {llvm-config = null;}; "llvm-hs-pretty" = callPackage @@ -150376,8 +150217,6 @@ self: { ]; description = "Journald back-end for logging-facade"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "logging-facade-syslog" = callPackage @@ -150457,13 +150296,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "logict_0_7_0_0" = callPackage - ({ mkDerivation, base, mtl }: + "logict_0_7_0_1" = callPackage + ({ mkDerivation, base, mtl, tasty, tasty-hunit }: mkDerivation { pname = "logict"; - version = "0.7.0.0"; - sha256 = "0c33ng5ck7nx7cl7nyl9vprqqi0k3q8l3k935b6gjzn7vzyg5iy6"; + version = "0.7.0.1"; + sha256 = "1zzcfxdl156rrr120vjcn2wawa2qdrninm6d4mxj215ig1a3aak5"; libraryHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base mtl tasty tasty-hunit ]; description = "A backtracking logic-programming monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -151335,8 +151175,6 @@ self: { ]; description = "Parameterized file evaluator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ltiv1p1" = callPackage @@ -151575,8 +151413,6 @@ self: { ]; description = "DSL for SVG using lucid for HTML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "lucienne" = callPackage @@ -152526,8 +152362,6 @@ self: { ]; description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "magico" = callPackage @@ -153477,8 +153311,6 @@ self: { libraryHaskellDepends = [ base call-stack tagged vector-space ]; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "map-classes" = callPackage @@ -155399,8 +155231,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Constant-time queries for the median of a stream of numeric data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mediawiki" = callPackage @@ -157895,8 +157725,6 @@ self: { ]; description = "Layout and render text with TrueType fonts using OpenGL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "miniutter" = callPackage @@ -158486,8 +158314,8 @@ self: { pname = "mmark"; version = "0.0.7.0"; sha256 = "0g7mx3xvvj8vgcids231zlz9kp7z3zjrq4xfhdm0wk0v1k51dflx"; - revision = "1"; - editedCabalFile = "1mj781f8b0hc57lw2zp1qag4sdxn0bkyzm5m321xagwk32iwz9qc"; + revision = "2"; + editedCabalFile = "06hr9p2lqyh4zx38i601yd24acbl08p69l0pwh8266qvfripcsm9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers deepseq dlist email-validate @@ -158502,6 +158330,37 @@ self: { benchmarkHaskellDepends = [ base criterion text weigh ]; description = "Strict markdown processor for writers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "mmark_0_0_7_1" = callPackage + ({ mkDerivation, aeson, base, case-insensitive, containers + , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec + , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens + , microlens-th, modern-uri, mtl, parser-combinators, QuickCheck + , text, text-metrics, unordered-containers, weigh, yaml + }: + mkDerivation { + pname = "mmark"; + version = "0.0.7.1"; + sha256 = "0apc582ck0g5ih0rpcljsfvss646ng62bjm37nj5z6k48symh16n"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base case-insensitive containers deepseq dlist email-validate + foldl hashable html-entity-map lucid megaparsec microlens + microlens-th modern-uri mtl parser-combinators text text-metrics + unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri + QuickCheck text + ]; + benchmarkHaskellDepends = [ base criterion text weigh ]; + description = "Strict markdown processor for writers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mmark-cli" = callPackage @@ -158525,6 +158384,8 @@ self: { ]; description = "Command line interface to the MMark markdown processor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mmark-ext" = callPackage @@ -158547,6 +158408,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Commonly useful extensions for the MMark markdown processor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mmorph" = callPackage @@ -158657,8 +158520,6 @@ self: { ]; description = "Mock records of functions easily"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mockery" = callPackage @@ -158711,8 +158572,6 @@ self: { ]; description = "Derive a model of a data type using Generics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "modelicaparser" = callPackage @@ -158817,8 +158676,6 @@ self: { libraryHaskellDepends = [ base ghc-typelits-knownnat ]; description = "Type-safe modular arithmetic"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "modular-arithmetic" = callPackage @@ -160219,8 +160076,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "The Acme and AcmeT monads"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "monadbi" = callPackage @@ -161099,8 +160954,6 @@ self: { testHaskellDepends = [ base binary containers hspec ]; description = "A few more collections"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "more-extensible-effects" = callPackage @@ -161425,8 +161278,6 @@ self: { ]; description = "General purpose migrations library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "moto-postgresql" = callPackage @@ -161442,8 +161293,6 @@ self: { ]; description = "PostgreSQL-based migrations registry for moto"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "motor" = callPackage @@ -161465,8 +161314,6 @@ self: { testHaskellDepends = [ base indexed indexed-extras row-types ]; description = "Type-safe effectful state machines in Haskell"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "motor-diagrams" = callPackage @@ -161486,8 +161333,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate state diagrams from Motor FSM typeclasses"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "motor-reflection" = callPackage @@ -161505,8 +161350,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Reflect on Motor FSM typeclasses to obtain runtime representations"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mount" = callPackage @@ -161904,8 +161747,8 @@ self: { }: mkDerivation { pname = "ms-tds"; - version = "0.1.0.4"; - sha256 = "0937a0iawdw1xspx7xjfn7xw83kbk4radkgjhrlb5hs5sj9phvz4"; + version = "0.2.0.0"; + sha256 = "0675h4w8nayvh2gm644anz8sqk37b1n5ia4w5fgyaf9y6drafyda"; libraryHaskellDepends = [ array base binary bytestring crypto-random data-default-class mtl network template-haskell text time tls uuid-types x509-store @@ -161938,8 +161781,6 @@ self: { ]; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "msgpack-aeson" = callPackage @@ -161958,8 +161799,6 @@ self: { testHaskellDepends = [ aeson base msgpack tasty tasty-hunit ]; description = "Aeson adapter for MessagePack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "msgpack-idl" = callPackage @@ -162046,8 +161885,8 @@ self: { }: mkDerivation { pname = "mssql-simple"; - version = "0.1.0.4"; - sha256 = "00mybypxy9kni94xnggkkkzk9xmx2r7q71hk2nsg0vcygfzvmpnk"; + version = "0.2.0.0"; + sha256 = "1pqw2kr8fyy62kmamvm600zsqri9d2201kixvr6gdy6z0ivyl0sz"; libraryHaskellDepends = [ base binary bytestring hostname ms-tds network text time tls ]; @@ -162585,8 +162424,6 @@ self: { ]; description = "create many files from one"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "multifocal" = callPackage @@ -163045,8 +162882,6 @@ self: { testHaskellDepends = [ base hspec transformers ]; description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "multivariant" = callPackage @@ -163795,8 +163630,6 @@ self: { libraryHaskellDepends = [ accelerate base mwc-random ]; description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mwc-random-monad" = callPackage @@ -164894,8 +164727,6 @@ self: { doHaddock = false; description = "A library for working with anything map related"; license = "(Apache-2.0 OR BSD-3-Clause)"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "narc" = callPackage @@ -165663,8 +165494,6 @@ self: { ]; description = "A graph database middleware to maintain a time-varying graph"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "net-spider-pangraph" = callPackage @@ -165808,8 +165637,6 @@ self: { ]; description = "Helper modules for comfort-array wrappers to BLAS and LAPACK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "netlib-ffi" = callPackage @@ -167188,8 +167015,6 @@ self: { ]; description = "ZeroMQ backend for network-transport"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "network-uri" = callPackage @@ -167913,8 +167738,6 @@ self: { libraryHaskellDepends = [ base integer-logarithms ]; description = "Finite nimber arithmetic"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "nirum" = callPackage @@ -168102,8 +167925,6 @@ self: { testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "Evaluate Haskell expressions using Nix to get packages"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "nix-paths" = callPackage @@ -169910,8 +169731,6 @@ self: { executableHaskellDepends = [ base nvim-hs ]; description = "Neovim plugin that runs ghcid to update the quickfix list"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "nvvm" = callPackage @@ -170794,8 +170613,6 @@ self: { ]; description = "Haskell utilities for building embedded Elm programs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "omaketex" = callPackage @@ -171357,8 +171174,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Open type representations and dynamic types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "open-union" = callPackage @@ -171430,8 +171245,6 @@ self: { libraryHaskellDepends = [ aeson base data-default text time ]; description = "A Haskell implementation of the Swiss Meteo Net data API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "opencog-atomspace" = callPackage @@ -173554,8 +173367,6 @@ self: { ]; description = "PADS data description language for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pagarme" = callPackage @@ -173692,34 +173503,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pairing_0_3_1" = callPackage + "pairing_0_4_1" = callPackage ({ mkDerivation, arithmoi, base, binary, bytestring, criterion - , cryptonite, errors, integer-logarithms, memory, protolude - , QuickCheck, quickcheck-instances, random, tasty, tasty-discover - , tasty-hunit, tasty-quickcheck, wl-pprint-text + , errors, galois-field, hexstring, integer-logarithms, memory + , MonadRandom, protolude, QuickCheck, quickcheck-instances, random + , tasty, tasty-discover, tasty-hunit, tasty-quickcheck + , wl-pprint-text }: mkDerivation { pname = "pairing"; - version = "0.3.1"; - sha256 = "0acg7kix9yi5mjssb9j0f9ign9qm551vgiiv3864gw1lmcrxh2ip"; + version = "0.4.1"; + sha256 = "0phw8caxrxyr2wlk8gcmrr8k03d0vnc4rq5c88dh3bb9jz4fdpcw"; libraryHaskellDepends = [ - arithmoi base binary bytestring cryptonite errors - integer-logarithms memory protolude QuickCheck random + arithmoi base binary bytestring errors galois-field + integer-logarithms memory MonadRandom protolude QuickCheck random wl-pprint-text ]; testHaskellDepends = [ - arithmoi base binary bytestring cryptonite errors - integer-logarithms memory protolude QuickCheck quickcheck-instances - random tasty tasty-discover tasty-hunit tasty-quickcheck - wl-pprint-text + arithmoi base binary bytestring errors galois-field hexstring + integer-logarithms memory MonadRandom protolude QuickCheck + quickcheck-instances random tasty tasty-discover tasty-hunit + tasty-quickcheck wl-pprint-text ]; testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ - arithmoi base binary bytestring criterion cryptonite errors - integer-logarithms memory protolude QuickCheck quickcheck-instances - random tasty tasty-hunit tasty-quickcheck wl-pprint-text + arithmoi base binary bytestring criterion errors galois-field + integer-logarithms memory MonadRandom protolude QuickCheck + quickcheck-instances random tasty tasty-hunit tasty-quickcheck + wl-pprint-text ]; - description = "Optimal ate pairing over Barreto-Naehrig curves"; + description = "Bilinear pairings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -174137,8 +173950,6 @@ self: { ]; description = "A Pandoc filter for including code from source files"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pandoc-japanese-filters" = callPackage @@ -174386,8 +174197,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.1.6"; - sha256 = "0cz6f17yh2zdr3zp3ld4pvi7xil5byi539dlqjslx8r442si694p"; + version = "0.1.7"; + sha256 = "1wmp5c7b9scdrhrh50cpjfpcw1riw4kxs1vy935mzwja1y4zalsj"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -175176,8 +174987,6 @@ self: { ]; description = "Classes and data structures for working with data-kind indexed types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "paramtree" = callPackage @@ -176222,8 +176031,6 @@ self: { ]; description = "Terminal-based presentations using Pandoc"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "patch-combinators" = callPackage @@ -177374,8 +177181,6 @@ self: { ]; description = "Static site generator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "penn-treebank" = callPackage @@ -178931,8 +178736,6 @@ self: { ]; description = "REST service for creating temporary PostgreSQL databases"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pg-recorder" = callPackage @@ -179665,8 +179468,6 @@ self: { libraryHaskellDepends = [ base unix ]; description = "Run an IO action protected by a pidfile"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pier" = callPackage @@ -180007,6 +179808,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes_4_3_11" = callPackage + ({ mkDerivation, base, criterion, exceptions, mmorph, mtl + , optparse-applicative, QuickCheck, semigroups, test-framework + , test-framework-quickcheck2, transformers, void + }: + mkDerivation { + pname = "pipes"; + version = "4.3.11"; + sha256 = "0h70djd6x306rci8zp356klqj6376xry6mkhyr12301adfhag8vv"; + libraryHaskellDepends = [ + base exceptions mmorph mtl semigroups transformers void + ]; + testHaskellDepends = [ + base mtl QuickCheck test-framework test-framework-quickcheck2 + transformers + ]; + benchmarkHaskellDepends = [ + base criterion mtl optparse-applicative transformers + ]; + description = "Compositional pipelines"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers @@ -180862,8 +180687,6 @@ self: { libraryHaskellDepends = [ base mwc-random pipes vector ]; description = "Producers for handling randomness"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pipes-rt" = callPackage @@ -181454,8 +181277,6 @@ self: { ]; description = "Token Introspection for PlanB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "planet-mitchell" = callPackage @@ -182472,18 +182293,22 @@ self: { }) {}; "poly" = callPackage - ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes - , semirings, tasty, tasty-quickcheck, vector + ({ mkDerivation, base, gauge, primitive, QuickCheck + , quickcheck-classes, semirings, tasty, tasty-quickcheck, vector + , vector-algorithms }: mkDerivation { pname = "poly"; - version = "0.2.0.0"; - sha256 = "19jdm2508ncwcci8bi9hwpaak3cymhbynnk3whmh0g6rny6zdla4"; - libraryHaskellDepends = [ base primitive semirings vector ]; + version = "0.3.0.0"; + sha256 = "0kwh1n9b6zh21kg2036v02jpr9xvvay6x72b044j4la65pal5h8i"; + libraryHaskellDepends = [ + base primitive semirings vector vector-algorithms + ]; testHaskellDepends = [ base QuickCheck quickcheck-classes semirings tasty tasty-quickcheck vector ]; + benchmarkHaskellDepends = [ base gauge semirings vector ]; description = "Polynomials"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -182651,27 +182476,27 @@ self: { "polysemy" = callPackage ({ mkDerivation, async, base, containers, criterion, doctest , first-class-families, free, freer-simple, hspec, hspec-discover - , inspection-testing, loopbreaker, mtl, syb, template-haskell - , th-abstraction, transformers, type-errors, unagi-chan + , inspection-testing, mtl, syb, template-haskell, th-abstraction + , transformers, type-errors, unagi-chan }: mkDerivation { pname = "polysemy"; - version = "0.6.0.0"; - sha256 = "0q9psm4y9ywq8fqgjvaxlfnfy39m4pj53nqmsgscz5xcycmb5nd1"; + version = "0.7.0.0"; + sha256 = "0p9f5m2invppncmd1d9sim1kvnzcgramnq3y1vr0bisg02y0c8dc"; libraryHaskellDepends = [ - async base containers first-class-families loopbreaker mtl syb - template-haskell th-abstraction transformers type-errors unagi-chan + async base containers first-class-families mtl syb template-haskell + th-abstraction transformers type-errors unagi-chan ]; testHaskellDepends = [ async base containers doctest first-class-families hspec - inspection-testing loopbreaker mtl syb template-haskell - th-abstraction transformers type-errors unagi-chan + inspection-testing mtl syb template-haskell th-abstraction + transformers type-errors unagi-chan ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ async base containers criterion first-class-families free - freer-simple loopbreaker mtl syb template-haskell th-abstraction - transformers type-errors unagi-chan + freer-simple mtl syb template-haskell th-abstraction transformers + type-errors unagi-chan ]; description = "Higher-order, low-boilerplate, zero-cost free monads"; license = stdenv.lib.licenses.bsd3; @@ -182849,8 +182674,6 @@ self: { ]; description = "Maps and sets of partial orders"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pomodoro" = callPackage @@ -183226,8 +183049,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Implementation of the Porter stemming algorithm"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ports" = callPackage @@ -183316,6 +183137,8 @@ self: { testHaskellDepends = [ base primitive tasty tasty-hunit ]; description = "posix bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "posix-error-codes" = callPackage @@ -185257,8 +185080,6 @@ self: { ]; description = "Functionality for beautifying GHCi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pretty-hex" = callPackage @@ -185639,8 +185460,6 @@ self: { testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "Prim typeclass instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "prim-ref" = callPackage @@ -185900,8 +185719,6 @@ self: { ]; description = "Arrays of Maybes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "primitive-offset" = callPackage @@ -185981,8 +185798,8 @@ self: { ({ mkDerivation, base, primitive, stm }: mkDerivation { pname = "primitive-unlifted"; - version = "0.1.1.0"; - sha256 = "183lg1jbbs9b1ahwzdsf5d75djcqr6c0hjvd1liwz5i13ad3qdcr"; + version = "0.1.2.0"; + sha256 = "1zq5fx032shxsk23hlyj9js8jdbg4r17l0gigsrbrnlajnwk4683"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive stm ]; description = "Primitive GHC types with unlifted types inside"; @@ -187119,8 +186936,6 @@ self: { ]; description = "Prometheus Haskell Client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "prometheus-client" = callPackage @@ -188315,8 +188130,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bindings for the pthread library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ptr" = callPackage @@ -190479,8 +190292,6 @@ self: { ]; description = "QuickCheck common typeclasses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "quickcheck-classes_0_6_2_1" = callPackage @@ -190505,7 +190316,6 @@ self: { description = "QuickCheck common typeclasses"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "quickcheck-combinators" = callPackage @@ -191373,8 +191183,6 @@ self: { ]; description = "The raaz cryptographic library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rabocsv2qif" = callPackage @@ -192393,8 +192201,6 @@ self: { ]; description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rapid-term" = callPackage @@ -192663,6 +192469,8 @@ self: { pname = "rasterific-svg"; version = "0.3.3.2"; sha256 = "1i0pl1hin1ipi3l0074ywd1khacpbvz3x0frx0j0hmbfiv4n3nq2"; + revision = "1"; + editedCabalFile = "19i9wlk951d85dqnmbgrnz0fg4xcw7cbv9cs2h8b440lycj3p4cv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192736,8 +192544,8 @@ self: { }: mkDerivation { pname = "rating-chgk-info"; - version = "0.3.6.4"; - sha256 = "0sfrsjlxlg08k0g8g65v21i2qr1ibq0cfgy7sayb1xbkqc319jvr"; + version = "0.3.6.5"; + sha256 = "08qfrrhc8kg95jvhv5m99zrb062w64z1jzm46zm4ah6mdjlpac18"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193123,8 +192931,6 @@ self: { ]; description = "Read-Copy-Update for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rdf" = callPackage @@ -193145,8 +192951,6 @@ self: { ]; description = "Representation and Incremental Processing of RDF Data"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rdf4h" = callPackage @@ -193857,13 +193661,13 @@ self: { , cubicbezier, diagrams, diagrams-contrib, diagrams-core , diagrams-lib, diagrams-svg, directory, filepath, fsnotify , hashable, JuicyPixels, lens, linear, matrices, matrix, mtl - , palette, parallel, process, reanimate-svg, svg-builder, text - , time, unix, websockets, xml + , open-browser, palette, parallel, process, reanimate-svg + , svg-builder, text, time, websockets, xml }: mkDerivation { pname = "reanimate"; - version = "0.1.4.1"; - sha256 = "04yzlznyrd4c21732ijl1y5c8kg6x3139jv3d5qvcxphsmkxw81f"; + version = "0.1.5.0"; + sha256 = "1jh9inlx92qn3klzi9385nfvphrwmmdbbs2gql019bdwmyhd815x"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -193871,8 +193675,8 @@ self: { attoparsec base bytestring containers cubicbezier diagrams diagrams-contrib diagrams-core diagrams-lib diagrams-svg directory filepath fsnotify hashable JuicyPixels lens linear matrices matrix - mtl palette parallel process reanimate-svg svg-builder text time - unix websockets xml + mtl open-browser palette parallel process reanimate-svg svg-builder + text time websockets xml ]; description = "Animation library based on SVGs"; license = stdenv.lib.licenses.publicDomain; @@ -194753,8 +194557,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Refinement types with static and runtime checking"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "reflection" = callPackage @@ -194891,8 +194693,6 @@ self: { executableHaskellDepends = [ base mtl reflex ]; description = "A basic `reflex` host for backend work"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "reflex-dom" = callPackage @@ -196253,8 +196053,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A data structure representing Relations on Sets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "relational-postgresql8" = callPackage @@ -196360,8 +196158,6 @@ self: { ]; description = "Examples of Haskell Relationa Record"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "relational-schemas" = callPackage @@ -197009,8 +196805,6 @@ self: { ]; description = "Scalar data types and conversions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "repa-series" = callPackage @@ -198727,8 +198521,6 @@ self: { ]; description = "Functional Reactive Programming with type-level clocks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rhine-gloss" = callPackage @@ -198743,8 +198535,6 @@ self: { executableHaskellDepends = [ base ]; description = "Gloss backend for Rhine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rhythm-game-tutorial" = callPackage @@ -198881,7 +198671,6 @@ self: { description = "api extensions for nvim-hs"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ribosome-root" = callPackage @@ -198975,8 +198764,6 @@ self: { ]; description = "Quick metrics to grow your app strong"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ridley-extras" = callPackage @@ -198994,8 +198781,6 @@ self: { testHaskellDepends = [ base ]; description = "Handy metrics that don't belong to ridley"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "riemann" = callPackage @@ -199534,8 +199319,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Haskell implementation of the RNCryptor file format"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rng-utils" = callPackage @@ -199746,8 +199529,6 @@ self: { ]; description = "RocksDB database querying library for Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "roguestar" = callPackage @@ -200834,8 +200615,6 @@ self: { ]; description = "Manipulate network devices, addresses, and routes on Linux"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rtorrent-rpc" = callPackage @@ -201487,8 +201266,6 @@ self: { ]; description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "safe-money-aeson" = callPackage @@ -201506,8 +201283,6 @@ self: { ]; description = "Instances from the aeson library for the safe-money library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "safe-money-cereal" = callPackage @@ -201525,8 +201300,6 @@ self: { ]; description = "Instances from the cereal library for the safe-money library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "safe-money-serialise" = callPackage @@ -201544,8 +201317,6 @@ self: { ]; description = "Instances from the serialise library for the safe-money library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "safe-money-store" = callPackage @@ -201563,8 +201334,6 @@ self: { ]; description = "Instances from the store library for the safe-money library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "safe-money-xmlbf" = callPackage @@ -201892,8 +201661,6 @@ self: { ]; description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "salak_0_2_9_3" = callPackage @@ -201917,7 +201684,6 @@ self: { description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "salak-toml" = callPackage @@ -203199,8 +202965,6 @@ self: { ]; description = "Work stealing scheduler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "schedyield" = callPackage @@ -203403,6 +203167,39 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "scidb-hquery" = callPackage + ({ mkDerivation, alex, array, base, BNFC, bytestring, Cabal + , connection, cryptonite, data-default-class, directory, exceptions + , filepath, happy, haskeline, hostname-validate, HTTP, http-client + , http-client-tls, http-conduit, http-types, memory, mtl, network + , process, regex, safe, split, terminal-size, text, tls, x509-store + }: + mkDerivation { + pname = "scidb-hquery"; + version = "2.8.0.432"; + sha256 = "0swjsgf84kwkzv7nwrnrzlpxbhdvi3i5pnnjrlgql9x4c30bqw6i"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal filepath ]; + libraryHaskellDepends = [ + array base bytestring connection cryptonite data-default-class + exceptions haskeline hostname-validate HTTP http-client + http-client-tls http-conduit http-types memory mtl network process + regex safe split terminal-size text tls x509-store + ]; + libraryToolDepends = [ alex BNFC happy ]; + executableHaskellDepends = [ + array base bytestring connection cryptonite data-default-class + directory exceptions filepath haskeline hostname-validate HTTP + http-client http-client-tls http-conduit http-types memory mtl + network process regex safe split terminal-size text tls x509-store + ]; + description = "Haskell query for SciDB via shim"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "science-constants" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -204939,12 +204736,12 @@ self: { }: mkDerivation { pname = "selective"; - version = "0.2"; - sha256 = "0xg0pd3vffdxfzwkiirhnzqwqsshfb7grs7a7p3lf4yrd08h90ms"; + version = "0.3"; + sha256 = "135lq99h1iaip44d5kh7wpb3fcf8f6ypn5rxngm5agazy6ia42as"; libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base containers mtl QuickCheck tasty tasty-expected-failure - tasty-quickcheck + tasty-quickcheck transformers ]; description = "Selective applicative functors"; license = stdenv.lib.licenses.mit; @@ -205019,8 +204816,6 @@ self: { executableHaskellDepends = [ base ]; description = "A Haskell library to make self-extracting executables"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "selfrestart" = callPackage @@ -205156,8 +204951,6 @@ self: { testHaskellDepends = [ base ]; description = "A Haskell implementation of semibounded lattices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "semigroupoid-extras" = callPackage @@ -205395,8 +205188,6 @@ self: { ]; description = "An implementation of semver and semantic version ranges"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "sendfile" = callPackage @@ -206595,7 +206386,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-checked-exceptions_2_1_0_0" = callPackage + "servant-checked-exceptions_2_2_0_0" = callPackage ({ mkDerivation, base, bytestring, hspec-wai, http-types, servant , servant-checked-exceptions-core, servant-client , servant-client-core, servant-server, tasty, tasty-hspec @@ -206603,8 +206394,8 @@ self: { }: mkDerivation { pname = "servant-checked-exceptions"; - version = "2.1.0.0"; - sha256 = "0dbbixk3852phxhfcj84v3525yp5nl5krcrw53wsgc91r0w529s7"; + version = "2.2.0.0"; + sha256 = "1shbnrjk2d0lq9nskl95jkfgr4ad79nx4k87zjg4c4m6m09nf5bh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206642,20 +206433,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-checked-exceptions-core_2_1_0_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, doctest, Glob, http-media - , http-types, profunctors, servant, servant-docs, tagged, text - , world-peace + "servant-checked-exceptions-core_2_2_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, contravariant, doctest + , Glob, http-media, http-types, mtl, profunctors, servant + , servant-docs, tagged, text, transformers, world-peace }: mkDerivation { pname = "servant-checked-exceptions-core"; - version = "2.1.0.0"; - sha256 = "1qmmbqniipx7bpinbjh9z0i2n0v71y6p3jak629aw0403rhq92pz"; + version = "2.2.0.0"; + sha256 = "1irakwsdj6f0yjp0cpgai6x01yq99qd2rwy1w3pb7xwiksdnxx6c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring http-media http-types profunctors servant - servant-docs tagged text world-peace + aeson base bytestring contravariant http-media http-types mtl + profunctors servant servant-docs tagged text transformers + world-peace ]; testHaskellDepends = [ base doctest Glob ]; description = "Checked exceptions for Servant APIs"; @@ -207786,8 +207578,6 @@ self: { ]; description = "Generate PureScript accessor functions for you servant API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-pushbullet-client" = callPackage @@ -210854,18 +210644,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "show-prettyprint_0_3" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter - , trifecta + "show-prettyprint_0_3_0_1" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, doctest + , prettyprinter, trifecta }: mkDerivation { pname = "show-prettyprint"; - version = "0.3"; - sha256 = "1q5q7gr73m059gslj1fpmydhqr28yav1v6jjshl2cv3yhmpp2zsy"; + version = "0.3.0.1"; + sha256 = "030dzprz07ib41f8pg2409zdxymvkk8jq4m0vczvgaajq3gghkdk"; libraryHaskellDepends = [ ansi-wl-pprint base prettyprinter trifecta ]; - testHaskellDepends = [ base doctest ]; + testHaskellDepends = [ + base containers doctest prettyprinter trifecta + ]; description = "Robust prettyprinter for output of auto-generated Show instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -210919,8 +210711,6 @@ self: { ]; description = "Clean up the formatting of 'show' output"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "shpider" = callPackage @@ -211174,8 +210964,6 @@ self: { ]; description = "Arithmetic over signs and sets of signs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "signal" = callPackage @@ -211991,20 +211779,16 @@ self: { }) {}; "simple-sql-parser" = callPackage - ({ mkDerivation, base, HUnit, mtl, parsec, pretty, test-framework - , test-framework-hunit - }: + ({ mkDerivation, base, mtl, parsec, pretty, tasty, tasty-hunit }: mkDerivation { pname = "simple-sql-parser"; - version = "0.4.4"; - sha256 = "1j1p94mfb7kzrayi39xcwmagxcf5j9lvxi7niqxc5jr70958csnl"; + version = "0.5.0"; + sha256 = "0d063wyrz8qynngy499i00hjkacd0xg01qni1wx2cbrcxg0xwcpd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec pretty ]; - testHaskellDepends = [ - base HUnit mtl parsec pretty test-framework test-framework-hunit - ]; - description = "A parser for SQL queries"; + testHaskellDepends = [ base mtl parsec pretty tasty tasty-hunit ]; + description = "A parser for SQL"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -212121,8 +211905,6 @@ self: { ]; description = "UI library for terminal"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "simple-units" = callPackage @@ -212341,8 +212123,6 @@ self: { librarySystemDepends = [ sqlite ]; description = "Simplest SQLite3 binding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) sqlite;}; "simplex" = callPackage @@ -213647,8 +213427,6 @@ self: { ]; description = "Flatten camel case text in LaTeX files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "smallcheck" = callPackage @@ -214518,8 +214296,6 @@ self: { ]; description = "Language handling for Snap"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "snap-loader-dynamic" = callPackage @@ -217080,8 +216856,6 @@ self: { ]; description = "Rotate about any suitable axis"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "spawn" = callPackage @@ -218299,6 +218073,8 @@ self: { ]; description = "A file-packing application"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sr-extra" = callPackage @@ -219551,8 +219327,6 @@ self: { ]; description = "Generate standalone haddock documentation for a set of packages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "star" = callPackage @@ -220192,8 +219966,6 @@ self: { ]; description = "What version is the package X in stackage lts-Y.ZZ?"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stb-image" = callPackage @@ -220230,8 +220002,6 @@ self: { libraryHaskellDepends = [ array base bytestring containers ]; description = "A wrapper around Sean Barrett's TrueType rasterizer library"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "std" = callPackage @@ -220695,8 +220465,6 @@ self: { libraryHaskellDepends = [ base stm transformers ]; description = "Software Transactional Memory lifted to MonadIO"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stm-linkedlist" = callPackage @@ -221112,6 +220880,58 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "store_0_5_1_2" = callPackage + ({ mkDerivation, array, async, base, base-orphans + , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector + , clock, containers, contravariant, criterion, cryptohash, deepseq + , directory, filepath, free, ghc-prim, hashable, hspec + , hspec-smallcheck, integer-gmp, lifted-base, monad-control + , mono-traversable, network, primitive, resourcet, safe, semigroups + , smallcheck, store-core, syb, template-haskell, text, th-lift + , th-lift-instances, th-orphans, th-reify-many, th-utilities, time + , transformers, unordered-containers, vector + , vector-binary-instances, void, weigh + }: + mkDerivation { + pname = "store"; + version = "0.5.1.2"; + sha256 = "1abwlcj0z17hj5h94cbg1sgqfdsdgjhgfgd2aaspsn4zdfk5bjc5"; + libraryHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant cryptohash deepseq directory + filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp + lifted-base monad-control mono-traversable network primitive + resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + testHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring clock containers contravariant cryptohash deepseq + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable network + primitive resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector void + ]; + benchmarkHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring cereal cereal-vector containers contravariant criterion + cryptohash deepseq directory filepath free ghc-prim hashable hspec + hspec-smallcheck integer-gmp lifted-base monad-control + mono-traversable network primitive resourcet safe semigroups + smallcheck store-core syb template-haskell text th-lift + th-lift-instances th-orphans th-reify-many th-utilities time + transformers unordered-containers vector vector-binary-instances + void weigh + ]; + description = "Fast binary serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "store-core" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, primitive, text , transformers @@ -221654,8 +221474,6 @@ self: { ]; description = "Concurrency support for the streaming ecosystem"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "streaming-conduit" = callPackage @@ -221771,8 +221589,6 @@ self: { ]; description = "A hand-written streaming byte parser for OpenStreetMap Protobuf data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "streaming-pcap" = callPackage @@ -221794,8 +221610,6 @@ self: { ]; description = "Stream packets via libpcap"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "streaming-png" = callPackage @@ -222855,8 +222669,6 @@ self: { ]; description = "Interface library for strongSwan SQL backend"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "strptime" = callPackage @@ -223198,28 +223010,21 @@ self: { }) {}; "suavemente" = callPackage - ({ mkDerivation, base, blaze-markup, bytestring, diagrams-core - , diagrams-lib, diagrams-svg, interpolatedstring-perl6, lens, mtl - , servant, servant-blaze, servant-server, servant-websockets, stm - , streaming, svg-builder, transformers, warp, websockets + ({ mkDerivation, aeson, base, blaze-markup, bytestring, colour + , containers, diagrams-core, diagrams-lib, diagrams-svg + , interpolatedstring-perl6, lens, mtl, servant, servant-blaze + , servant-server, servant-websockets, stm, streaming, svg-builder + , text, transformers, warp, websockets }: mkDerivation { pname = "suavemente"; - version = "0.1.0.0"; - sha256 = "1595jc7lqvdk60p0cc3vjag7lgd90ayfwb16n70i1j9sz3b2qvva"; - isLibrary = true; - isExecutable = true; + version = "0.2.0.0"; + sha256 = "0m5sfa3sx67mx1wsps0vpr4g4vq64rmdml6p930r1jp3b4rd41wa"; libraryHaskellDepends = [ - base blaze-markup bytestring diagrams-core diagrams-lib - diagrams-svg interpolatedstring-perl6 lens mtl servant + aeson base blaze-markup bytestring colour containers diagrams-core + diagrams-lib diagrams-svg interpolatedstring-perl6 lens mtl servant servant-blaze servant-server servant-websockets stm streaming - svg-builder transformers warp websockets - ]; - executableHaskellDepends = [ - base blaze-markup bytestring diagrams-core diagrams-lib - diagrams-svg interpolatedstring-perl6 lens mtl servant - servant-blaze servant-server servant-websockets stm streaming - svg-builder transformers warp websockets + svg-builder text transformers warp websockets ]; description = "An applicative functor that seamlessly talks to HTML inputs"; license = stdenv.lib.licenses.bsd3; @@ -223365,8 +223170,6 @@ self: { ]; description = "Match / replace substrings with a parser combinators"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "subtitleParser" = callPackage @@ -224809,8 +224612,6 @@ self: { ]; description = "Library for symantic grammars"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "symantic-http" = callPackage @@ -225192,8 +224993,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Generic representation and manipulation of abstract syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "syntactical" = callPackage @@ -226122,8 +225921,6 @@ self: { ]; description = "Layout text as grid or table"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "table-tennis" = callPackage @@ -227737,8 +227534,6 @@ self: { testHaskellDepends = [ base QuickCheck tasty ]; description = "Pre-built tasty trees for checking lawful class properties using QuickCheck"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tasty-rerun" = callPackage @@ -229333,8 +229128,6 @@ self: { ]; description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3; vte_291 = pkgs.vte;}; "termplot" = callPackage @@ -231861,8 +231654,6 @@ self: { ]; description = "Haskell API bindings for http://themoviedb.org"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "themplate" = callPackage @@ -232202,8 +231993,6 @@ self: { ]; description = "Simple, IO-based library for Erlang-style thread supervision"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "threadscope" = callPackage @@ -232438,8 +232227,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "throwable-exceptions gives the easy way to throw exceptions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "thumbnail" = callPackage @@ -233071,8 +232858,6 @@ self: { ]; description = "Parsers for types in `time`"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "time-patterns" = callPackage @@ -234377,8 +234162,6 @@ self: { libraryHaskellDepends = [ base ]; description = "A todo bottom"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "todos" = callPackage @@ -234672,7 +234455,7 @@ self: { broken = true; }) {}; - "tomland_1_0_1_0" = callPackage + "tomland_1_1_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , gauge, hashable, hedgehog, hspec-megaparsec, htoml , htoml-megaparsec, markdown-unlit, megaparsec, mtl, parsec @@ -234682,8 +234465,8 @@ self: { }: mkDerivation { pname = "tomland"; - version = "1.0.1.0"; - sha256 = "1f5819bxv9ybj5ygpndlhyfsjl3i6x03xfrgpxnjkjk0pyjmywx2"; + version = "1.1.0.0"; + sha256 = "0ip3pp76jf6di18r10ksxw35a2594k7h1iygm0b4k77m4fx4bqzn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -235469,8 +235252,6 @@ self: { ]; description = "Distributed tracing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tracker" = callPackage @@ -235502,8 +235283,6 @@ self: { ]; description = "A command-line tool for live monitoring"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "traction" = callPackage @@ -236087,8 +235866,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Type Safe Web Routing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "trasa-client" = callPackage @@ -236105,8 +235882,6 @@ self: { ]; description = "Type safe http requests"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "trasa-reflex" = callPackage @@ -236140,8 +235915,6 @@ self: { ]; description = "Type safe web server"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "trasa-th" = callPackage @@ -236158,8 +235931,6 @@ self: { testHaskellDepends = [ base trasa ]; description = "Template Haskell to generate trasa routes"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "traverse-with-class" = callPackage @@ -236861,8 +236632,6 @@ self: { ]; description = "TripleSec is a simple, triple-paranoid, symmetric encryption library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "trivia" = callPackage @@ -237810,8 +237579,6 @@ self: { libraryHaskellDepends = [ base eventloop ]; description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "twentefp-graphs" = callPackage @@ -240229,8 +239996,6 @@ self: { ]; description = "Opinionated Haskell Interoperability"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "unbound" = callPackage @@ -242114,8 +241879,6 @@ self: { ]; description = "Command-line tool to generate paths for moving upward in a file system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "up-grade" = callPackage @@ -242589,8 +242352,6 @@ self: { ]; description = "Painfully simple URL deployment"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "urn" = callPackage @@ -243329,6 +243090,8 @@ self: { ]; description = "Orphan instances for the UUID datatype"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uuid-quasi" = callPackage @@ -243599,8 +243362,6 @@ self: { ]; description = "Runs commands on remote machines using ssh"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "valid" = callPackage @@ -244108,8 +243869,6 @@ self: { ]; description = "Client library for HashiCorp's Vault tool (via HTTP API)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "vault-tool-server" = callPackage @@ -244358,8 +244117,26 @@ self: { benchmarkHaskellDepends = [ base criterion fin vector ]; description = "Vec: length-indexed (sized) list"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "vec_0_1_1_1" = callPackage + ({ mkDerivation, adjunctions, base, base-compat, criterion, deepseq + , distributive, fin, hashable, inspection-testing, lens + , semigroupoids, tagged, transformers, vector + }: + mkDerivation { + pname = "vec"; + version = "0.1.1.1"; + sha256 = "0gzypyi4vv5ajysbmnpicm8r2qh95nmmrj9l6hp30b95i36cb5as"; + libraryHaskellDepends = [ + adjunctions base base-compat deepseq distributive fin hashable lens + semigroupoids transformers + ]; + testHaskellDepends = [ base fin inspection-testing tagged ]; + benchmarkHaskellDepends = [ base criterion fin vector ]; + description = "Vec: length-indexed (sized) list"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "vect" = callPackage @@ -244626,8 +244403,6 @@ self: { ]; description = "Utilities for the \"vector\" library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "vector-fftw" = callPackage @@ -245150,8 +244925,6 @@ self: { ]; description = "types for ingesting vflow data with aeson"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "vfr-waypoints" = callPackage @@ -245360,8 +245133,6 @@ self: { executableHaskellDepends = [ base ]; description = "Frontend for video metadata tagging tools"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "vimus" = callPackage @@ -246131,8 +245902,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Low-level low-overhead vulkan api bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "waargonaut" = callPackage @@ -247657,8 +247426,6 @@ self: { ]; description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "wai-routing" = callPackage @@ -249415,8 +249182,6 @@ self: { libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) webkitgtk;}; "webkitgtk3" = callPackage @@ -249737,6 +249502,8 @@ self: { ]; description = "A school-timetable problem-solver"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "weigh" = callPackage @@ -250045,8 +249812,6 @@ self: { ]; description = "Data types for large but fixed width signed and unsigned integers"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "wigner-symbols" = callPackage @@ -250468,8 +250233,6 @@ self: { testHaskellDepends = [ base conduit hspec HUnit mtl ]; description = "Run computations that depend on one or more elements in a stream"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "witherable" = callPackage @@ -251268,6 +251031,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "world-peace_1_0_0_0" = callPackage + ({ mkDerivation, aeson, base, deepseq, doctest, Glob, profunctors + , should-not-typecheck, tagged, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "world-peace"; + version = "1.0.0.0"; + sha256 = "1fx8f7dfrslqwmkbcyff5q7iafa5znc73f77il7y87hz23q9yzmx"; + libraryHaskellDepends = [ aeson base deepseq profunctors tagged ]; + testHaskellDepends = [ + base doctest Glob should-not-typecheck tasty tasty-hunit text + ]; + description = "Open Union and Open Product Types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wp-archivebot" = callPackage ({ mkDerivation, base, feed, HTTP, network, parallel, tagsoup }: mkDerivation { @@ -251727,8 +251507,6 @@ self: { ]; description = "A simple CLI utility for interacting with a websocket"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ws-chans" = callPackage @@ -251751,8 +251529,6 @@ self: { ]; description = "Unagi chan based websocket client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "wsdl" = callPackage @@ -254683,8 +254459,6 @@ self: { ]; description = "Yam Web"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yam_0_6_3" = callPackage @@ -254719,7 +254493,6 @@ self: { description = "A wrapper of servant"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yam-app" = callPackage @@ -254774,8 +254547,6 @@ self: { ]; description = "Yam DataSource Middleware"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yam-datasource_0_6_3" = callPackage @@ -254794,7 +254565,6 @@ self: { description = "Yam DataSource Middleware"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yam-job" = callPackage @@ -255518,8 +255288,6 @@ self: { libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; description = "Hedgehog testing support for the Yaya recursion scheme library"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yaya-unsafe" = callPackage @@ -256656,8 +256424,6 @@ self: { ]; description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yesod-fb" = callPackage @@ -257048,8 +256814,6 @@ self: { ]; description = "A pagination approach for yesod"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yesod-paypal-rest" = callPackage @@ -259267,8 +259031,6 @@ self: { ]; description = "More constrained extensions to zeromq4-haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "zeroth" = callPackage @@ -260122,8 +259884,6 @@ self: { ]; description = "Creating and extracting arbitrary archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "zuramaru" = callPackage @@ -260175,8 +259935,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Password strength estimation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; } -- cgit 1.4.1 From 4464d4e57cdb9065fbe24444b5826b0581c7863f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 9 Jul 2019 10:00:55 +0200 Subject: git-annex: update sha256 hash for version 7.20190708 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 81d6c0a4458c..c975b1e2a2ca 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -72,7 +72,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "02vj13qyzjbk14ddpabycq2mwzggsk63vddffjyzaqpy9d7x35s9"; + sha256 = "11d4qyhmc774h2xyrpyn9rxx99x3vjs0fcxsg49gj5ayzmykafap"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; -- cgit 1.4.1 From 520f8464b0331d3c2f3c588d2c411dfab93ef2bf Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 3 Jul 2019 15:03:21 -0500 Subject: jsoncpp: 1.8.4 -> 1.9.0 --- pkgs/development/libraries/jsoncpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index b543d47a050d..fa2b45ae948e 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jsoncpp"; - version = "1.8.4"; + version = "1.9.0"; src = fetchFromGitHub { owner = "open-source-parsers"; repo = "jsoncpp"; rev = version; - sha256 = "1z0gj7a6jypkijmpknis04qybs1hkd04d1arr3gy89lnxmp6qzlm"; + sha256 = "10wnwlq92gp32f5p55kjcc12jfsl0yq6f2y4abb0si6wym12krw9"; }; /* During darwin bootstrap, we have a cp that doesn't understand the -- cgit 1.4.1 From 9921afa53feea9c4f6f8a02b2577dafceb6a2a4b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 3 Jul 2019 15:00:30 -0500 Subject: trilium: (0.32.4,0.33.5) -> 0.33.6 --- pkgs/applications/office/trilium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 788f2ccf3d1f..c1e2fdcc7dfa 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "trilium-${version}"; - version = "0.32.4"; + version = "0.33.6"; src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "05h5k5n63pmf6mmyfpw41xf6lzfd8dwdhy7r5fmhdxy2gpl3a817"; + sha256 = "1sg6iqhpgyr8zr6w6dgs0ha0indb9vyp8vh2clj2fds5ahhlvf91"; }; # Fetch from source repo, no longer included in release. -- cgit 1.4.1 From fcd6773c4c2c6c4f126159bfa763a27c8e448b42 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 3 Jul 2019 14:44:50 -0500 Subject: electrum: 3.3.6 -> 3.3.7 --- pkgs/applications/misc/electrum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 2f8b98f3a446..0de055df5698 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -14,14 +14,14 @@ }: let - version = "3.3.6"; + version = "3.3.7"; # Not provided in official source releases, which are what upstream signs. tests = fetchFromGitHub { owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "0s8i6fn1jwk80d036n4c7csv4qnx2k15f6347kr4mllglcpa9hb3"; + sha256 = "1g2kbbsi6k105q6s0la20h12gz8dzka5kdcjbdhs12jqsjfx3lr0"; extraPostFetch = '' mv $out ./all @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0am5ki3z0yvhrz16vp2jjy5fkxxqph0mj9qqpbw3kpql65shykwz"; + sha256 = "13ahc4zqpgzmck2r663sqqgz86xsd83r5qqi26mh2vazy1i6pykz"; }; postUnpack = '' -- cgit 1.4.1 From e7c08055e4a787a8116a9d113c99560bdd6dc5e1 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 9 Jul 2019 15:15:02 +0300 Subject: netdata: 1.15.0 -> 1.16.0 --- pkgs/tools/system/netdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index a749595b4154..5455728a10c2 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -12,12 +12,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.15.0"; + version = "1.16.0"; name = "netdata-${version}"; src = fetchurl { url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz"; - sha256 = "04frfy08k6m70y3s8j3gvnfnqqd9d5mwj3j6krk9dsh34332abvx"; + sha256 = "0kwbrkv7g9m7l580myd2r8bpxqn6fxmx5vd6xh7x94wygfffhann"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; -- cgit 1.4.1 From 5c8472a2a17625855d0811ebb5709c9aa84fdd3f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 28 Jun 2019 23:46:55 -0400 Subject: mesa: fix darwin and use meson auto features (PR #63912) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes the darwin build, while also using Meson’s auto features as much as possible. As a result, we avoid using having to specify default drivers and instead delegate that to Mesa’s build system. Removed other flags that were specified to the default in Mesa. The -fno-common is needed to address undefined symbol _lp_dummy_tile in the build. --- pkgs/development/libraries/mesa/default.nix | 81 +++++------------------------ 1 file changed, 14 insertions(+), 67 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1f1962d64023..2c5e4a8e034e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -5,9 +5,9 @@ , libelf, libvdpau, python3Packages , libglvnd , enableRadv ? true -, galliumDrivers ? null -, driDrivers ? null -, vulkanDrivers ? null +, galliumDrivers ? ["auto"] +, driDrivers ? ["auto"] +, vulkanDrivers ? ["auto"] , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] , OpenGL, Xplugin , withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light @@ -26,43 +26,6 @@ with stdenv.lib; -let - # platforms that have PCIe slots and thus can use most non-integrated GPUs - pciePlatform = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64; - defaultGalliumDrivers = optionals (elem "drm" eglPlatforms) ([ "virgl" ] - ++ lib.optionals pciePlatform [ "r300" "r600" "radeonsi" ] - ++ lib.optionals (pciePlatform || stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "nouveau" ] - ++ lib.optionals stdenv.hostPlatform.isx86 [ "svga" ] - ++ lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "vc4" ] - ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "freedreno" "etnaviv" ] - ); - defaultDriDrivers = optionals (elem "drm" eglPlatforms) ([ ] - ++ lib.optionals pciePlatform [ "r200" ] - ++ lib.optionals (pciePlatform || stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "nouveau" ] - ++ lib.optionals stdenv.hostPlatform.isx86 [ "i915" "i965" ]); - defaultVulkanDrivers = optionals stdenv.hostPlatform.isLinux ([ ] - ++ lib.optional stdenv.hostPlatform.isx86 "intel" - ++ lib.optional enableRadv "amd"); -in - -let gallium_ = galliumDrivers; dri_ = driDrivers; vulkan_ = vulkanDrivers; in - -let - galliumDrivers = - (if gallium_ == null - then defaultGalliumDrivers - else gallium_) - ++ lib.optional stdenv.isLinux "swrast"; - driDrivers = - (if dri_ == null - then optionals (elem "drm" eglPlatforms) defaultDriDrivers - else dri_); - vulkanDrivers = - if vulkan_ == null - then defaultVulkanDrivers - else vulkan_; -in - let version = "19.1.1"; branch = head (splitString "." version); @@ -110,8 +73,7 @@ stdenv.mkDerivation rec { }) ]; - outputs = [ "out" "dev" "drivers" ] - ++ lib.optional (elem "swrast" galliumDrivers) "osmesa"; + outputs = [ "out" "dev" "drivers" "osmesa" ]; # TODO: Figure out how to enable opencl without having a runtime dependency on clang mesonFlags = [ @@ -135,28 +97,11 @@ stdenv.mkDerivation rec { "-Domx-libs-path=${placeholder "drivers"}/lib/bellagio" "-Dva-libs-path=${placeholder "drivers"}/lib/dri" "-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d" - - "-Dgallium-vdpau=true" - "-Dgallium-xvmc=true" - "-Dgallium-opencl=disabled" - "-Dshared-glapi=true" - "-Dgles1=true" - "-Dgles2=true" - "-Dglx=dri" + ] ++ optionals stdenv.isLinux [ "-Dglvnd=true" - "-Dllvm=true" - "-Dshared-llvm=true" - "-Dglx-direct=true" - ] ++ optional (elem "swrast" galliumDrivers) "-Dosmesa=gallium" # used by wine - ++ optionals (stdenv.isLinux) [ - "-Ddri3=true" - "-Dgallium-omx=bellagio" - "-Dgallium-va=true" - "-Dgallium-xa=true" # used in vmware driver - "-Dgallium-nine=true" # Direct3D in Wine - "-Dgbm=true" - "-Degl=true" - ]; + "-Dosmesa=gallium" # used by wine + "-Dgallium-nine=true" # Direct3D in Wine + ]; buildInputs = with xorg; [ expat llvmPackages.llvm libglvnd xorgproto @@ -183,8 +128,8 @@ stdenv.mkDerivation rec { postInstall = '' # Some installs don't have any drivers so this directory is never created. - mkdir -p $drivers - '' + optionalString (galliumDrivers != []) '' + mkdir -p $drivers $osmesa + '' + optionalString stdenv.isLinux '' mkdir -p $drivers/lib # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM @@ -206,7 +151,7 @@ stdenv.mkDerivation rec { for js in $drivers/share/glvnd/egl_vendor.d/*.json; do substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_" done - '' + optionalString (vulkanDrivers != []) '' + # Update search path used by Vulkan (it's pointing to $out but # drivers are in $drivers) for js in $drivers/share/vulkan/icd.d/*.json; do @@ -217,7 +162,7 @@ stdenv.mkDerivation rec { # TODO: # check $out doesn't depend on llvm: builder failures are ignored # for some reason grep -qv '${llvmPackages.llvm}' -R "$out"; - postFixup = optionalString (galliumDrivers != []) '' + postFixup = optionalString stdenv.isLinux '' # set the default search path for DRI drivers; used e.g. by X server substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace "$drivers" "${libglvnd.driverLink}" @@ -238,6 +183,8 @@ stdenv.mkDerivation rec { done ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-fno-common"; + passthru = { inherit libdrm; inherit (libglvnd) driverLink; -- cgit 1.4.1 From fa48ab5556b624aeec9c408d75712fcecff9268c Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 9 Jul 2019 20:56:47 +0800 Subject: packr: 2.5.1 -> 2.5.2 --- pkgs/development/libraries/packr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index c44695cb70a3..bc8133aaf822 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "packr"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "gobuffalo"; repo = pname; rev = "v${version}"; - sha256 = "070hpnsr5w1r1cg9wl80cafmhkx4z3s29wq04fa7rk49hmwml4jy"; + sha256 = "1ciffa5xbd93fylwz93wr4m4fj83dcla55dmdshaqz28rbsapnc1"; }; - modSha256 = "0xvpk9jjcqac44s4fp0jwpljxvs0ypjwc5qfg0w90s2r7jn50fxn"; + modSha256 = "086gydrl3i35hawb5m7rsb4a0llcpdpgid1xfw2z9n6jkwkclw4n"; meta = with lib; { description = "The simple and easy way to embed static files into Go binaries"; -- cgit 1.4.1 From f658a3c80754634dca8293ab229ea7323bf61ffd Mon Sep 17 00:00:00 2001 From: Daniël de Kok Date: Tue, 2 Jul 2019 08:38:54 +0200 Subject: drawio: init at 10.8.0 draw.io is an application for drawing diagrams. This is the (offline) desktop version of the draw.io web application. --- pkgs/applications/graphics/drawio/default.nix | 94 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 96 insertions(+) create mode 100644 pkgs/applications/graphics/drawio/default.nix diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix new file mode 100644 index 000000000000..70cf1c149ab1 --- /dev/null +++ b/pkgs/applications/graphics/drawio/default.nix @@ -0,0 +1,94 @@ +{ stdenv, lib, fetchurl, rpmextract, autoPatchelfHook, wrapGAppsHook + +# Dynamic libraries +, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, dbus, cups, expat +, gdk_pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor +, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst +, libxcb, libuuid, nspr, nss, pango + +, systemd +}: + +stdenv.mkDerivation rec { + pname = "drawio"; + version = "10.8.0"; + + src = fetchurl { + url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; + sha256 = "0c5wymzhbp72x0yhvw7vb4akkdvj97npl9kglk79vqjbzfn5di9k"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + rpmextract + wrapGAppsHook + ]; + + buildInputs = [ + alsaLib + atk + at-spi2-atk + at-spi2-core + cairo + cups + dbus + expat + gdk_pixbuf + glib + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libxcb + libuuid + nspr + nss + pango + systemd + ]; + + runtimeDependencies = [ + systemd.lib + ]; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = "rpmextract ${src}"; + + installPhase = '' + mkdir -p $out/share + cp -r opt/draw.io $out/share/ + + # Application icon + mkdir -p $out/share/icons/hicolor + cp -r usr/share/icons/hicolor/0x0 $out/share/icons/hicolor/1024x1024 + + # XDG desktop item + cp -r usr/share/applications $out/share/applications + + # Symlink wrapper + mkdir -p $out/bin + ln -s $out/share/draw.io/draw.io $out/bin/draw.io + + # Update binary path + substituteInPlace $out/share/applications/draw.io.desktop \ + --replace /opt/draw.io/draw.io $out/bin/draw.io + ''; + + meta = with stdenv.lib; { + description = "A desktop application for creating diagrams"; + homepage = https://about.draw.io/; + license = licenses.asl20; + maintainers = with maintainers; [ danieldk ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3e4654c12fd..bac84f65cd4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17434,6 +17434,8 @@ in dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { }; + drawio = callPackage ../applications/graphics/drawio {}; + drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile { buildClient = false; -- cgit 1.4.1 From 91f523c38ee5b7f48c639077c63088c165b63bcc Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 9 Jul 2019 21:17:19 +0800 Subject: pax-utils: 1.2.2 -> 1.2.4 --- pkgs/os-specific/linux/pax-utils/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 5de0081a411c..917652ca6f79 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "pax-utils-${version}"; - version = "1.2.2"; + pname = "pax-utils"; + version = "1.2.4"; src = fetchurl { - url = "https://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha512 = "26f7lqr1s2iywj8qfbf24sm18bl6f7cwsf77nxwwvgij1z88gvh6yx3gp65zap92l0xjdp8kwq9y96xld39p86zd9dmkm447czykbvb"; + url = "http://distfiles.gentoo.org/distfiles/${pname}-${version}.tar.xz"; + sha256 = "01kr6l2c3bhbgdrmwgzh6jk0jjkw3pi9xrzzl9cpn0ibyf68p1aj"; }; makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "ELF utils that can check files for security relevant properties"; longDescription = '' A suite of ELF tools to aid auditing systems. Contains @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { for displaying PaX and security info on a large groups of binary files. ''; - homepage = https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities; + homepage = "https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice joachifm ]; -- cgit 1.4.1 From 421a87d94c9aa1cb3318c8fb530ed5efa8b5a27c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 9 Jul 2019 15:19:19 +0200 Subject: python38: init at 3.8.0b2 --- .../python/cpython/3.8/no-ldconfig.patch | 100 +++++++++++++++++++++ pkgs/development/interpreters/python/default.nix | 13 +++ pkgs/top-level/all-packages.nix | 4 +- pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch diff --git a/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch new file mode 100644 index 000000000000..a1f9d68eb166 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch @@ -0,0 +1,100 @@ +From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk +Date: Mon, 28 Aug 2017 09:24:06 +0200 +Subject: [PATCH] Don't use ldconfig + +--- + Lib/ctypes/util.py | 70 ++---------------------------------------------------- + 1 file changed, 2 insertions(+), 68 deletions(-) + +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 5e8b31a854..7b45ce6c15 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -94,46 +94,7 @@ elif os.name == "posix": + import re, tempfile + + def _findLib_gcc(name): +- # Run GCC's linker with the -t (aka --trace) option and examine the +- # library name it prints out. The GCC command will fail because we +- # haven't supplied a proper program with main(), but that does not +- # matter. +- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) +- +- c_compiler = shutil.which('gcc') +- if not c_compiler: +- c_compiler = shutil.which('cc') +- if not c_compiler: +- # No C compiler available, give up +- return None +- +- temp = tempfile.NamedTemporaryFile() +- try: +- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] +- +- env = dict(os.environ) +- env['LC_ALL'] = 'C' +- env['LANG'] = 'C' +- try: +- proc = subprocess.Popen(args, +- stdout=subprocess.PIPE, +- stderr=subprocess.STDOUT, +- env=env) +- except OSError: # E.g. bad executable +- return None +- with proc: +- trace = proc.stdout.read() +- finally: +- try: +- temp.close() +- except FileNotFoundError: +- # Raised if the file was already removed, which is the normal +- # behaviour of GCC if linking fails +- pass +- res = re.search(expr, trace) +- if not res: +- return None +- return os.fsdecode(res.group(0)) ++ return None + + + if sys.platform == "sunos5": +@@ -255,34 +216,7 @@ elif os.name == "posix": + else: + + def _findSoname_ldconfig(name): +- import struct +- if struct.calcsize('l') == 4: +- machine = os.uname().machine + '-32' +- else: +- machine = os.uname().machine + '-64' +- mach_map = { +- 'x86_64-64': 'libc6,x86-64', +- 'ppc64-64': 'libc6,64bit', +- 'sparc64-64': 'libc6,64bit', +- 's390x-64': 'libc6,64bit', +- 'ia64-64': 'libc6,IA-64', +- } +- abi_type = mach_map.get(machine, 'libc6') +- +- # XXX assuming GLIBC's ldconfig (with option -p) +- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' +- regex = os.fsencode(regex % (re.escape(name), abi_type)) +- try: +- with subprocess.Popen(['/sbin/ldconfig', '-p'], +- stdin=subprocess.DEVNULL, +- stderr=subprocess.DEVNULL, +- stdout=subprocess.PIPE, +- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: +- res = re.search(regex, p.stdout.read()) +- if res: +- return os.fsdecode(res.group(1)) +- except OSError: +- pass ++ return None + + def _findLib_ld(name): + # See issue #9998 for why this is needed +-- +2.15.0 + diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 119c0a2728b4..7f21d03fc3a5 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -98,6 +98,19 @@ in { inherit passthruFun; }; + python38 = callPackage ./cpython { + self = python38; + sourceVersion = { + major = "3"; + minor = "8"; + patch = "0"; + suffix = "b2"; + }; + sha256 = "1rh9dz5vmc56y45d6j2wfjw4m7x25i6v8vyld4mrqh06s2gn1hbl"; + inherit (darwin) CF configd; + inherit passthruFun; + }; + pypy27 = callPackage ./pypy { self = pypy27; sourceVersion = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e9047b88531..c68fea1cf5ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8537,6 +8537,7 @@ in python35Full = python35.override{x11Support=true;}; python36Full = python36.override{x11Support=true;}; python37Full = python37.override{x11Support=true;}; + python38Full = python38.override{x11Support=true;}; # pythonPackages further below, but assigned here because they need to be in sync pythonPackages = python.pkgs; @@ -8544,13 +8545,14 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python {}; - inherit (pythonInterpreters) python27 python35 python36 python37 pypy27 pypy35; + inherit (pythonInterpreters) python27 python35 python36 python37 python38 pypy27 pypy35; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); python35Packages = python35.pkgs; python36Packages = python36.pkgs; python37Packages = recurseIntoAttrs python37.pkgs; + python38Packages = python38.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; pypy27Packages = pypy27.pkgs; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eaee38ceaeb4..ace40b3b2095 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18,7 +18,7 @@ let packages = ( self: let - inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy3k isPyPy pythonAtLeast pythonOlder; callPackage = pkgs.newScope self; -- cgit 1.4.1 From 99f0083ea51039917e45dec58f139aea54796317 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sat, 6 Jul 2019 21:14:48 +0200 Subject: pythonPackages.telethon: 1.8.0 -> 1.9.0 --- pkgs/development/python-modules/telethon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index ec1c01df7c77..334163114a18 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "telethon"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit version; pname = "Telethon"; - sha256 = "6e8f55cbe26a031d427f2c3e23d391b8c2272d1540bcb36fe4df65d928ca2b25"; + sha256 = "a8797ad5bfee2b350cfc9b73cbb30fc19c8f73c0db42471e0df1371b1a269edc"; }; propagatedBuildInputs = [ -- cgit 1.4.1 From baddb2ac8907844888a4387c04393ae930ecc8d2 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sun, 30 Jun 2019 12:06:39 +0200 Subject: mautrix-telegram: 0.5.2 -> 0.6.0 --- pkgs/servers/mautrix-telegram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 496b8c493904..7499f203136c 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "03dbd389e05aa08c52ef36ca362fcc9aa103f6c6173bb093ed03a96e05e8d43d"; + sha256 = "fbed41838e1ef7e43f6e47ff38f9906cb311cfc5b3b6bc6f704babd7c83b193d"; }; postPatch = '' -- cgit 1.4.1 From 0bc362c4851e2cd34b34ce7afcad9d8cdfb4c586 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 9 Jul 2019 20:32:51 +0300 Subject: dotnet-sdk: fix debugging Without this attempt to run debugger fails with "Unknown error 0x80131c3c". Underlying problem is that libmscordbi.so cannot find libmscordaccore.so. --- pkgs/development/compilers/dotnet/sdk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix index b4f35b1c4c01..6c1fa37e81a4 100644 --- a/pkgs/development/compilers/dotnet/sdk/default.nix +++ b/pkgs/development/compilers/dotnet/sdk/default.nix @@ -28,7 +28,7 @@ in runHook preBuild patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" ./dotnet patchelf --set-rpath "${rpath}" ./dotnet - find -type f -name "*.so" -exec patchelf --set-rpath "${rpath}" {} \; + find -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \; echo -n "dotnet-sdk version: " ./dotnet --version runHook postBuild -- cgit 1.4.1 From a52e70e10e47a22238d81d8a52e547f5925ca73c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 27 Jun 2019 18:54:27 -0500 Subject: pahole: 1.12 -> 1.15 --- pkgs/development/tools/misc/pahole/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index 3864ad945835..5b17f111b45a 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, cmake, elfutils, zlib }: stdenv.mkDerivation rec { - name = "pahole-${version}"; - version = "1.12"; + pname = "pahole"; + version = "1.15"; src = fetchgit { url = https://git.kernel.org/pub/scm/devel/pahole/pahole.git; - sha256 = "1a8xfwqdc2j3ydh9bk2pkvsaf3lrkbxj66vj991c7knc31ix8kpw"; rev = "v${version}"; + sha256 = "10af9mh3qxbx0hgjcmh0vjbg22bgxzhbpd9395ymasyw4npg6l9x"; }; nativeBuildInputs = [ cmake ]; -- cgit 1.4.1 From 14a7161fa594e4277231c7f2e0bb5dbeb8e5cd81 Mon Sep 17 00:00:00 2001 From: Ben Hipple Date: Tue, 9 Jul 2019 19:05:59 +0000 Subject: mirrors.nix: add alsa-project.org for alsa Aside from being an HTTPS endpoint, this is the canonical mirror for alsa project downloads. --- pkgs/build-support/fetchurl/mirrors.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index d9e44afb68df..f2336db8852b 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -409,9 +409,10 @@ rec { # Alsa Project alsa = [ - ftp://ftp.alsa-project.org/pub/ - http://alsa.cybermirror.org/ - http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/ - http://alsa.mirror.fr/ + https://www.alsa-project.org/files/pub/ + ftp://ftp.alsa-project.org/pub/ + http://alsa.cybermirror.org/ + http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/ + http://alsa.mirror.fr/ ]; } -- cgit 1.4.1 From fc15a97b7b319f56dbcc1d286d13b0f709ed41d0 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Tue, 9 Jul 2019 09:17:06 -0400 Subject: eclipses: 2018-12 -> 2019-06 --- pkgs/applications/editors/eclipse/default.nix | 18 +++++++++--------- pkgs/applications/editors/eclipse/plugins.nix | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 3fa46fc4d927..972a9daded41 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -13,10 +13,10 @@ assert stdenv ? glibc; let platform_major = "4"; - platform_minor = "10"; - year = "2018"; - month = "12"; - timestamp = "201812060815"; + platform_minor = "12"; + year = "2019"; + month = "06"; + timestamp = "201906051800"; in rec { @@ -34,7 +34,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "1f5yr7cydz4iw8c14yn713d44f1g1wkiqiwmb4ikdfx4l70rc5xxsdxv9b4mhm89b02cqnxdh9p5hivkssmnzg0km3ab5bx9mvzgzx7"; + sha512 = "3mfljabrwbwq256vvsp9qjb96hzlbpwgnb3wz806pbyh0ibfq6s1hn8kh5aaa2da5821v0ykcxa12jagj7naqp4g91jqxp1wb1ygz2q"; }; }; @@ -46,7 +46,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "18psh1lgqg21dmndyc0yr6rz7piqyk861j9mlhgv9xaq8nz11fb6lil594sk64yyv0qbgi98vp03f1p06zvhgs37k9rjkfjmzl7n97k"; + sha512 = "18p6xz6rq4w6j39b2k9kjpz8s1nljfq44g2cmvxqjgjfkq8lk4ij73ssyv1raly4wkm7r22ixacswdjmyj942k5vpv9y11i91hp1scv"; }; }; @@ -58,7 +58,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "2zdvbjk05a00lbcad9v30rcr93j03d2pycdhpwrvrakr8z4yrxs6svamq9s294ry1w3lw04pgsnqklw6zjx6iil1kp51f374lkfpxn7"; + sha512 = "0qiyk95qhdqcfgg5hgc7pcpbpjy9jnx7l3vb7s4cgijdz2xz0n5psh11lpj3whk2amh4iwkyx7kn8fxdq7lm03rlgx67cbk7p8my16m"; }; }; @@ -88,7 +88,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "1kq14vhzcngfhl8kjs722rshny81gxv6wcgln46x7lnpg2274sb9dprhns62fpq97l0355cmg8mnny6fsd1nqibrw09xq932v86cfm8"; + sha512 = "3bbc8d66ms7nhg6f8gb0bnzjqz26wixpipn4n9qf0azcplrv2j91z8hjw1fx39dx4pqnsf442bkgab4qqhkpks7qq54110l01q6gvy9"; }; }; @@ -100,7 +100,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "2xd5q7kg3aly7jnz2fijn06ljmnnd7ggwwzmndfhqwfzxpyjg1lnlln76pcd6chx7gnwdrl7khg0fs566ddabfjv17c46dj5fpw9y6j"; + sha512 = "20qs1aagh4drsycvar3x42zy422zl34yg1p3vhxbqfbf7v3z1d3cxs9ah61x4bdxx9bkfwchasqp1wr15nflch9g0i50bdki3cgng1d"; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 08733d21f790..cf7980582ff7 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -254,12 +254,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; - version = "9.6.0"; + version = "9.8.1"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.6/${name}/${name}.zip"; - sha256 = "08rk3b1va57jcy4s161fx0xmb8dn47akhhxd2f28hspq6i2jqicm"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.8/${name}/${name}.zip"; + sha256 = "0kxmwz75i8mv4wics9n0hspxhzl3glf5ry2v5mnl5j9gcf73b0nv"; }; meta = with stdenv.lib; { @@ -474,12 +474,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.10"; + version = "4.12"; src = fetchzip { stripRoot = false; - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.10-201812060815/org.eclipse.jdt-4.10.zip; - sha256 = "1h11w3zd6xy5w4sk6xnyb2a27wxwhp83qfx67ji7bzdrwbvljqkz"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.12-201906051800/org.eclipse.jdt-4.12.zip; + sha256 = "0qscvqg69z4554n1yhl0xg1xz8ln3qsbgfzi7cg3xnnwnxfqz9cb"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From 32ff51cafb5017e3b52795b9a848b3fac278997d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 9 Jul 2019 15:18:35 -0500 Subject: lazydocker: 0.5 -> 0.5.5 (#64484) --- pkgs/tools/misc/lazydocker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index f0c1227274e2..ea8f781e4055 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lazydocker"; - version = "0.5"; + version = "0.5.5"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "0f062xn58dbci22pg6y4ifcdfs8whzlv2jjprxxk2ygzixrrjwnc"; + sha256 = "0h2c1f9r67i6a8ppspsg1ln9rkm272092aaaw55sd15xxr51s4hb"; }; - modSha256 = "02n0lg28icy11a2j2rrlmp70blby0kmjas5j48jwh9h9a0yplqic"; + modSha256 = "1lrrwcr95fxk4dlinyg74vqyxwwzagymncfps9bgig5v5d8gdd8j"; subPackages = [ "." ]; -- cgit 1.4.1 From 8d33a03ac2f08633a53189f8c444ff7804ae6fc6 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 8 Jul 2019 10:19:06 +0200 Subject: vimPlugins: Update --- pkgs/misc/vim-plugins/generated.nix | 48 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 64b250e3a4c7..37c3af2995fd 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -248,12 +248,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2019-07-08"; + version = "2019-07-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "8c7241d7e3f56bc2efda92c05e0148dcf7c41bc6"; - sha256 = "0agn16dj800sydqwjdr85m3d66hfbn8hh1azb2hsniwd5d1qkr6v"; + rev = "b24601e6af3677dd5fd0d70bdcdc97a30591ae37"; + sha256 = "0zxbrjy141ci02hwds200b6v1gj1bm98wbhr5wjmir8r9k4hrqg9"; }; }; @@ -436,12 +436,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-07-08"; + version = "2019-07-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "8a9f52235c32011c91ad3630bed88cdcc6b55b08"; - sha256 = "0wvawl32w3zg04l513h7cby0ks4zzxli6m3yzyyv92ajnkmj4n0h"; + rev = "0538a6449e9d1237d6df738ec612b7c3fe01b6f1"; + sha256 = "0jznqn9hpiy3z2smss7z7lv0d37brm6a104cagbxbk7qar6dl97w"; }; }; @@ -538,12 +538,12 @@ let deoplete-ternjs = buildVimPluginFrom2Nix { pname = "deoplete-ternjs"; - version = "2019-07-03"; + version = "2019-07-09"; src = fetchFromGitHub { owner = "carlitux"; repo = "deoplete-ternjs"; - rev = "d82a008e26e323b8b3290c58ee87fe9e3dbd83cd"; - sha256 = "0bzvd3wn46p8bv0mmwlhcr68mpghg5sj9gnc52syjn2302kibkar"; + rev = "fe5935dcf3cbaa663c81e2b9705a93840a407e56"; + sha256 = "04yqw92yjcvimwvx1dqqc50y52j3y4zkvjkxmpmfnyx86ah730fk"; }; }; @@ -1103,12 +1103,12 @@ let limelight-vim = buildVimPluginFrom2Nix { pname = "limelight-vim"; - version = "2016-06-23"; + version = "2019-07-09"; src = fetchFromGitHub { owner = "junegunn"; repo = "limelight.vim"; - rev = "106fb5749d227a0de72e36068ed72798c6fd48e6"; - sha256 = "0fp4yp50n5v5zx3a7afh9wip4nwcfhmdgdzwpnl79jvild1z9fgh"; + rev = "26e913a2e061195245bc62d24009ab67143a3c32"; + sha256 = "0bxmihv9i96k6pl37pzgri03vbvjwlp34rl4gkj8w2ajhhi6nsnn"; }; }; @@ -1312,12 +1312,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-07-07"; + version = "2019-07-09"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "3fe8bea59e6f19538968ea41ac33d6418071ffd6"; - sha256 = "0rnwzwk4vqvnp42854vxzxllyqap44p9wfppp89c1j0x2hi3ylih"; + rev = "bc68b453e2e28bcaa5fa1bf841c78a0a4b0cc5ec"; + sha256 = "0y6qjj1czk2wiax60zsnjbixa3lp10y9777ll7r65jdrhjrysd7v"; }; }; @@ -2874,12 +2874,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-07-08"; + version = "2019-07-09"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "102b3a50e20d857b38e4c392b78be9a340669a70"; - sha256 = "0q7icsjycxw4l5awapkj8sig297f37hcyk5s4ns0ldrylh0xckl9"; + rev = "5f9602e12f27bd59e38a0814c524c7c385ef4137"; + sha256 = "1w12n7m607sa8rl704m1wq763zzz556ii1izsqnlyyrag0ld51cq"; }; }; @@ -2951,12 +2951,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-07-04"; + version = "2019-07-09"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "3ab5d6c5448258d6ec3939d900f6ad431c3bad86"; - sha256 = "16ngnyy31xyghiz02gmpdr3l08inp95ncfknf57y7bd711jjj09m"; + rev = "09edd7a4ff02895ffe48a51b6c83e104b7cd013a"; + sha256 = "0mki5zy1r36vbs8fn2arb6nbw4b88iqsgdw00lw3263c8bdw23z7"; }; }; @@ -3370,12 +3370,12 @@ let vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2019-06-05"; + version = "2019-07-09"; src = fetchFromGitHub { owner = "plasticboy"; repo = "vim-markdown"; - rev = "0e43b4c5b06466cb54540b7452db6c6b22e33539"; - sha256 = "0wl7i071ql5h1aqhjj1kiwzl8f1s69n1a37cmsrh2czdc8s85qlj"; + rev = "da5a7ac96f517e0fd6f886bc3fbe27156ca1f946"; + sha256 = "198bsv88njz6l2pf9yjxb8292aj7x8n2sxi50q3cdsg29a3y2i5c"; }; }; -- cgit 1.4.1 From f597e3eeaaf3464190abd53a5da951d79ebd050b Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 8 Jul 2019 10:20:03 +0200 Subject: vimPlugins: Init various coc extension plugins --- pkgs/misc/vim-plugins/generated.nix | 352 +++++++++++++++++++++++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 32 +++ 2 files changed, 384 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 37c3af2995fd..edfafc4e9d37 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -246,6 +246,358 @@ let }; }; + coc-css = buildVimPluginFrom2Nix { + pname = "coc-css"; + version = "2019-06-25"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-css"; + rev = "235009ac2a92172cdae66987b172264230c04f74"; + sha256 = "1i7bhiibcr2k5c0l79ddsfxirkhxs3cp9x83b4ys1zy2yaxljlw6"; + }; + }; + + coc-denite = buildVimPluginFrom2Nix { + pname = "coc-denite"; + version = "2019-01-26"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-denite"; + rev = "ec7dfd56612664c20bb0f6a19c524100cd2047ed"; + sha256 = "0fc03ndq7ys4lvqgfbh314fsvbcjf3nm4spfklsmz2c587qbvv1l"; + }; + }; + + coc-emmet = buildVimPluginFrom2Nix { + pname = "coc-emmet"; + version = "2019-06-17"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-emmet"; + rev = "557bc1b88a84d9191337169484603a56fdb30adb"; + sha256 = "1fla5i3fimm5h31qrivralbmhb88n1pkwzdfj74i6rd20fmv4xcx"; + }; + }; + + coc-eslint = buildVimPluginFrom2Nix { + pname = "coc-eslint"; + version = "2019-06-17"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-eslint"; + rev = "c8f1639146748b46f871144ed471c44741492c97"; + sha256 = "0adz0wv0kmyhgz5ahqrdkp8lp2nrxh06b6rri2z7jbgplyksa0qc"; + }; + }; + + coc-git = buildVimPluginFrom2Nix { + pname = "coc-git"; + version = "2019-07-08"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-git"; + rev = "5551aa4af056b790467aafc3ab734eb5f5e9a8f1"; + sha256 = "0rzyrlhrkvi7nzwbq2bina1j9ml22kxddj76ykwbxqkb6wxlzjqn"; + }; + }; + + coc-go = buildVimPluginFrom2Nix { + pname = "coc-go"; + version = "2019-05-24"; + src = fetchFromGitHub { + owner = "josa42"; + repo = "coc-go"; + rev = "2393c9860927e91874f6d13174cc1edeec758d9c"; + sha256 = "1szq2nr3gppza2rq8b6kh4a8f3h831gzbnbnv45ycrcyplb4w2sy"; + }; + }; + + coc-highlight = buildVimPluginFrom2Nix { + pname = "coc-highlight"; + version = "2019-07-01"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-highlight"; + rev = "00e3cc159b3ce427d9f4e7993bcd963f37a3eb54"; + sha256 = "0q9dfnn598499b8r9nsw0fi5ng873rvhwl5l70zqnc8ny9rbv74r"; + }; + }; + + coc-html = buildVimPluginFrom2Nix { + pname = "coc-html"; + version = "2019-06-17"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-html"; + rev = "f88704f9f252ebf5c6bfbc65c0747a3fd668ca3e"; + sha256 = "010p0dmd7x3sxmhjdrcawrrcgzz56dmgf0rxmi8vy3jk6x2ydnai"; + }; + }; + + coc-imselect = buildVimPluginFrom2Nix { + pname = "coc-imselect"; + version = "2019-05-07"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-imselect"; + rev = "21b40909211767701f639b2c55662e841ea34138"; + sha256 = "188db3lw4n7m0ahkij43cvmrni4rji6gwxdsy5vydh30af0p4br7"; + }; + }; + + coc-java = buildVimPluginFrom2Nix { + pname = "coc-java"; + version = "2019-06-17"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-java"; + rev = "fb8309d745a075370654bcb810350e5accf590b6"; + sha256 = "14mvfsp7k5m7591j2j9cvp56dyxr8s679jyjidb41v7jshqgh16g"; + }; + }; + + coc-jest = buildVimPluginFrom2Nix { + pname = "coc-jest"; + version = "2019-06-17"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-jest"; + rev = "a893464148ab205ef717f543e205c0ae6cb05009"; + sha256 = "0d83cmpiq2x0v7bbnyka30pp1rl33idb6zfisahc25ycnkh32212"; + }; + }; + + coc-json = buildVimPluginFrom2Nix { + pname = "coc-json"; + version = "2019-06-21"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-json"; + rev = "fafaa178b3b4df80a4a6f3a23522fa1a7d16bccb"; + sha256 = "1s9yr5pqk76bb6qsw05qzywm8k65b9wplg4kxn65vs1a9zl7m296"; + }; + }; + + coc-lists = buildVimPluginFrom2Nix { + pname = "coc-lists"; + version = "2019-07-04"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-lists"; + rev = "6d6da810f24484278cd227f1907f6f94931092d6"; + sha256 = "143a0rxcpml30nbaig17c5vn076qscj48qcpb4pjdh0qkfk9mvp0"; + }; + }; + + coc-neco = buildVimPluginFrom2Nix { + pname = "coc-neco"; + version = "2018-12-21"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-neco"; + rev = "2c33b8b5a9847ff5b4abca37be88131cc4d746ab"; + sha256 = "10b23y5g16ggb5mrn1f6dv5mr3ncg0wpn8bvn8g22zz4g737nzii"; + }; + }; + + coc-pairs = buildVimPluginFrom2Nix { + pname = "coc-pairs"; + version = "2019-07-04"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-pairs"; + rev = "79d02d8d3834c2a5fa44dde77b800de0b2d9746e"; + sha256 = "00d97qx4fvnwsh82j33p5jm0lxqadns4104jx9gzha7rmx1z62al"; + }; + }; + + coc-prettier = buildVimPluginFrom2Nix { + pname = "coc-prettier"; + version = "2019-06-30"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-prettier"; + rev = "6f30d4c5f0b6c4cf1ff0f5f7229377fc95fe249a"; + sha256 = "0882ppaa69fp2hcncd54znaff944iraypxilr31nr51a6d9lbcs9"; + }; + }; + + coc-python = buildVimPluginFrom2Nix { + pname = "coc-python"; + version = "2019-06-28"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-python"; + rev = "bfa80768fe1cb417c8d6a117f300378e2cab0cee"; + sha256 = "1vqwcjjxkdf6q0rzj7ps2b05dsvccf0xphgb2hl3lgsw2dqdn24y"; + }; + }; + + coc-r-lsp = buildVimPluginFrom2Nix { + pname = "coc-r-lsp"; + version = "2019-06-19"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-r-lsp"; + rev = "2a7a544fba67233ed6d400ccf8d9fcea8f163d85"; + sha256 = "0cjlfd31cpny4cwd3nwsv7n7rykfksqazxqap5q4iq1hpz8zsdh0"; + }; + }; + + coc-rls = buildVimPluginFrom2Nix { + pname = "coc-rls"; + version = "2019-06-19"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-rls"; + rev = "1053500ba968c685e96e55b536a7e1ba679dc822"; + sha256 = "02ldgiay99vmi3033h8y40iz6fhqyjhxl63yvyp8ylr7x76lg0a0"; + }; + }; + + coc-smartf = buildVimPluginFrom2Nix { + pname = "coc-smartf"; + version = "2019-06-26"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-smartf"; + rev = "a77e6573be47d237957f0272a368f48c44b337a8"; + sha256 = "0k2f4xa223yzbp32828f5j766v61dkl2yp87qd0dxsgzgcwigdzi"; + }; + }; + + coc-snippets = buildVimPluginFrom2Nix { + pname = "coc-snippets"; + version = "2019-07-03"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-snippets"; + rev = "aa77cb797953fdd8d41708701753f974663f94fc"; + sha256 = "1c4rylcvhrnicaq6v9l8pgyhlic6m1p92z6061z2cj9m09lv2rc0"; + }; + }; + + coc-solargraph = buildVimPluginFrom2Nix { + pname = "coc-solargraph"; + version = "2019-06-21"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-solargraph"; + rev = "f7732c49d5173a4f32f3419eaf591857b9d753cb"; + sha256 = "14fcl9zwyq8rpc9pdbydsf1jilc8wmylvs8wjc13l8h3avndpkwd"; + }; + }; + + coc-stylelint = buildVimPluginFrom2Nix { + pname = "coc-stylelint"; + version = "2019-06-19"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-stylelint"; + rev = "627d6aa41f4d64fba5bee5830a9fc0b9799ab5d5"; + sha256 = "1jgd2w9kxgrf3sg55jfg8i2afwvsyvjs656fhb48ynhw0dxf0nvp"; + }; + }; + + coc-tabnine = buildVimPluginFrom2Nix { + pname = "coc-tabnine"; + version = "2019-07-05"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-tabnine"; + rev = "50504d07788c890c77675d8ca284ef219d72ee98"; + sha256 = "0ha4yrj455icr2m4nflh0vqhc917xhn9732qlc1hg9rzhfk3a3zd"; + }; + }; + + coc-tslint = buildVimPluginFrom2Nix { + pname = "coc-tslint"; + version = "2019-07-03"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-tslint"; + rev = "6128761577806d7047fa05d1a527945490d6316c"; + sha256 = "1vi4vrawknkd5wjyb0j143jbfis9vaanl219a7argirwjs057vpd"; + }; + }; + + coc-tslint-plugin = buildVimPluginFrom2Nix { + pname = "coc-tslint-plugin"; + version = "2019-06-19"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-tslint-plugin"; + rev = "c2134f487f892ff3beb60b856d21c6791486d460"; + sha256 = "0jldrh5vlfijarmzz0zhpc8k9dwngxcsygfqr3nirmj8dcx7zccb"; + }; + }; + + coc-tsserver = buildVimPluginFrom2Nix { + pname = "coc-tsserver"; + version = "2019-06-27"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-tsserver"; + rev = "f574fc35bde261970455022eeb8202e387bfad90"; + sha256 = "143pb96bfc1y7s2hnrp29dmy1rlwqv5ypj1vx0dy60qaymyvznwp"; + }; + }; + + coc-vetur = buildVimPluginFrom2Nix { + pname = "coc-vetur"; + version = "2019-06-28"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-vetur"; + rev = "56d3cd6cc30b160252f9c32cdbb4851ace2f10de"; + sha256 = "16j89n0fkqxvs0ld44zlbm0w4xqfl0zsd82z2xa0dgj9hxqmpfyb"; + }; + }; + + coc-vimtex = buildVimPluginFrom2Nix { + pname = "coc-vimtex"; + version = "2019-06-20"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-vimtex"; + rev = "842b37bb4078863ca5f070731e21effad14f5d58"; + sha256 = "07w1rp6jxn7q99p6gb28azgial71frjpx06ciz49yib8816rzim9"; + }; + }; + + coc-wxml = buildVimPluginFrom2Nix { + pname = "coc-wxml"; + version = "2019-06-20"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-wxml"; + rev = "f02550939d33a0175c34186904c376bbae878e60"; + sha256 = "1448019dzdy55j4plhzlnp2qkfzk0zkqqs7kn94ndn60hn1x889m"; + }; + }; + + coc-yaml = buildVimPluginFrom2Nix { + pname = "coc-yaml"; + version = "2019-06-20"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-yaml"; + rev = "aca9aae69ecd7f0953ab3353361b4ce9f089dbd8"; + sha256 = "1f7d4hbily073pdf3cmmb2vfhb65nxljpin2dhlh57f0l1jiipdn"; + }; + }; + + coc-yank = buildVimPluginFrom2Nix { + pname = "coc-yank"; + version = "2019-06-28"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-yank"; + rev = "6b05809b9826db8ce4e124d0662522599a250ba0"; + sha256 = "1h0479ds0j5bfc2amq3v3r1ilafgaksjxn7mmk4zpxrc0kbcjjdh"; + }; + }; + coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; version = "2019-07-09"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index b0e4dad8911b..981965b323b9 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -126,6 +126,7 @@ jlanzarotta/bufexplorer jnurmine/zenburn jonbri/vim-colorstepper joonty/vim-xdebug +josa42/coc-go jpalardy/vim-slime JuliaEditorSupport/deoplete-julia JuliaEditorSupport/julia-vim @@ -228,7 +229,38 @@ ncm2/ncm2-jedi ncm2/ncm2-path ncm2/ncm2-tmux ncm2/ncm2-ultisnips +neoclide/coc-css +neoclide/coc-denite +neoclide/coc-emmet +neoclide/coc-eslint +neoclide/coc-git +neoclide/coc-highlight +neoclide/coc-html +neoclide/coc-imselect +neoclide/coc-java +neoclide/coc-jest +neoclide/coc-json +neoclide/coc-lists +neoclide/coc-neco neoclide/coc.nvim +neoclide/coc-pairs +neoclide/coc-prettier +neoclide/coc-python +neoclide/coc-rls +neoclide/coc-r-lsp +neoclide/coc-smartf +neoclide/coc-snippets +neoclide/coc-solargraph +neoclide/coc-stylelint +neoclide/coc-tabnine +neoclide/coc-tslint +neoclide/coc-tslint-plugin +neoclide/coc-tsserver +neoclide/coc-vetur +neoclide/coc-vimtex +neoclide/coc-wxml +neoclide/coc-yaml +neoclide/coc-yank neoclide/vim-easygit neomake/neomake neovimhaskell/haskell-vim -- cgit 1.4.1 From 1b18ef672813b599b5b7ce1746aadb1e2d3ed8ca Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 8 Jul 2019 21:08:54 +0200 Subject: vimPlugins.coc-go: Ensure dependencies are available --- pkgs/misc/vim-plugins/overrides.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index cbeb4789e717..033a02a65848 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -11,13 +11,16 @@ , Cocoa, CoreFoundation, CoreServices , buildVimPluginFrom2Nix +# coc-go dependency +, go + # vim-go denpencies , asmfmt, delve, errcheck, godef, golint , gomodifytags, gotags, gotools, go-motion , gnused, reftools, gogetdoc, gometalinter , impl, iferr, gocode, gocode-gomod, go-tools -# vCoolor dep +# vCoolor dependency , gnome3 }: @@ -109,6 +112,12 @@ self: super: { ''; }); + coc-go = super.coc-go.overrideAttrs(old: { + preFixup = '' + substituteInPlace "$out"/share/vim-plugins/coc-go/src/utils/tools.ts \ + --replace 'const cmd = `GOPATH=''${gopath}; go ''${args}`' 'const cmd = `GOPATH=''${gopath}; ${go}/bin/go ''${args}`' + ''; + }); coc-nvim = let version = "0.0.72"; -- cgit 1.4.1 From b730ae12afad2a9ed606e516d8b5c85584da21a7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 9 Jul 2019 16:20:00 -0500 Subject: prometheus_2: 2.10.0 -> 2.11.0 Changelog: https://github.com/prometheus/prometheus/releases/tag/v2.11.0 --- pkgs/servers/monitoring/prometheus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index a9ee991bac7a..3523c3b08170 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -48,7 +48,7 @@ in rec { }; prometheus_2 = buildPrometheus { - version = "2.10.0"; - sha256 = "00597rf4cg20clr3g3ql3nf47r8qij2xspcpp8y8mpxm2b60zjnq"; + version = "2.11.0"; + sha256 = "0x5q2zv8nvqdns8780rsbdhv44azg1fz631ji2rlmiy1l6n1q3hb"; }; } -- cgit 1.4.1 From acb11340749109b49757f7a6b58ff8fa75e03ca3 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 9 Jul 2019 17:09:44 -0500 Subject: nixos/foundationdb: s/pidFile/pidfile/ Fixes an evaluation regression introduced by a case-typo in de6e5ea8152b29c975096d7d4b7d0938874ee37a Signed-off-by: Austin Seipp --- nixos/modules/services/databases/foundationdb.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index 6182da5e7d65..3746b875c7f2 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -363,7 +363,7 @@ in "d /etc/foundationdb 0755 ${cfg.user} ${cfg.group} - -" "d '${cfg.dataDir}' 0770 ${cfg.user} ${cfg.group} - -" "d '${cfg.logDir}' 0770 ${cfg.user} ${cfg.group} - -" - "F '${cfg.pidFile}' - ${cfg.user} ${cfg.group} - -" + "F '${cfg.pidfile}' - ${cfg.user} ${cfg.group} - -" ]; systemd.services.foundationdb = { -- cgit 1.4.1 From 8578d7ab800e7970f7675217901e34eedd09f5ae Mon Sep 17 00:00:00 2001 From: edef Date: Tue, 9 Jul 2019 22:30:40 +0000 Subject: etcd: 3.3.1 -> 3.3.13 While I would've liked to keep them, the release branch drops the tools directory as of v3.3.4, seemingly without explanation: https://github.com/etcd-io/etcd/commit/074e4177707f4daead816c108a06980d77d0aad0 master appears to contain them, so they might return at some point. --- pkgs/servers/etcd/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index d6b71f816083..d3c5555fa6ad 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { name = "etcd-${version}"; - version = "3.3.1"; # After updating check that nixos tests pass + version = "3.3.13"; # After updating check that nixos tests pass rev = "v${version}"; goPackagePath = "github.com/coreos/etcd"; @@ -13,15 +13,12 @@ buildGoPackage rec { inherit rev; owner = "coreos"; repo = "etcd"; - sha256 = "11gzmi05y4kpnzgqc737l0wk5svxai4z17nl92jazqga6zhyavyl"; + sha256 = "1kac4qfr83f2hdz35403f1ald05wc85vvhw79vxb431n61jvyaqy"; }; subPackages = [ "cmd/etcd" "cmd/etcdctl" - "cmd/tools/benchmark" - "cmd/tools/etcd-dump-db" - "cmd/tools/etcd-dump-logs" ]; buildInputs = [ libpcap ]; -- cgit 1.4.1 From 950d91cc9cc994cfa0009ab21442b643ced5d986 Mon Sep 17 00:00:00 2001 From: edef Date: Tue, 9 Jul 2019 23:46:21 +0000 Subject: nixos/tests: include the etcd-cluster test in all-tests.nix We seem to have had this test for quite a while, but nothing seems to reference it. --- nixos/tests/all-tests.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 2f527bfa090d..665a75e47dad 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -77,6 +77,7 @@ in elk = handleTestOn ["x86_64-linux"] ./elk.nix {}; env = handleTest ./env.nix {}; etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {}; + etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {}; ferm = handleTest ./ferm.nix {}; firefox = handleTest ./firefox.nix {}; firewall = handleTest ./firewall.nix {}; -- cgit 1.4.1 From def7d562e01430ab48f4ab84a6363bfdbe6e584a Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 9 Jul 2019 20:18:51 -0400 Subject: pantheon.wingpanel-indicator-session: 2.2.3 -> 2.2.4 https://github.com/elementary/wingpanel-indicator-session/releases/tag/2.2.4 --- .../pantheon/desktop/wingpanel-indicators/session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index 5b1bd161b05f..b6607d54a7e8 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-session"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1y0blff02p3w23sv17yg7fq0yq0g2k8j7vjmk92k664fx72kjjzh"; + sha256 = "1x2p2sjal42bspmqcg9lzixv6rnihvgmwk92gfcccrmvk8j4bx6s"; }; passthru = { -- cgit 1.4.1 From b3bce2cfa2dc9929d8c24989b800e1a10e1a64f3 Mon Sep 17 00:00:00 2001 From: edef Date: Wed, 10 Jul 2019 00:42:48 +0000 Subject: nixos/tests/etcd-cluster: be more lenient about member addition --- nixos/tests/etcd-cluster.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/etcd-cluster.nix b/nixos/tests/etcd-cluster.nix index 3c4de5950a79..43fde7d59205 100644 --- a/nixos/tests/etcd-cluster.nix +++ b/nixos/tests/etcd-cluster.nix @@ -140,7 +140,7 @@ in { }; subtest "should add another member", sub { - $node1->succeed("etcdctl member add node3 https://node3:2380"); + $node1->waitUntilSucceeds("etcdctl member add node3 https://node3:2380"); $node3->start(); $node3->waitForUnit("etcd.service"); $node3->waitUntilSucceeds("etcdctl member list | grep 'node3'"); -- cgit 1.4.1 From d2c3c1f2bb169b15d649177865cb7cd9fc60459b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 2 Jul 2019 13:29:40 +0000 Subject: ocaml-ng.ocamlPackages_4_08: 4.08.0+rc2 -> 4.08.0 --- pkgs/development/compilers/ocaml/4.08.nix | 4 ++-- pkgs/top-level/ocaml-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ocaml/4.08.nix b/pkgs/development/compilers/ocaml/4.08.nix index cdc5314f3c77..4f9b8ebd294c 100644 --- a/pkgs/development/compilers/ocaml/4.08.nix +++ b/pkgs/development/compilers/ocaml/4.08.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "08"; - patch_version = "0+rc2"; - sha256 = "09wp2iig6v5pivkjcnibdvkg5mchcj3q4zms6ij67039xczm8qrg"; + patch_version = "0"; + sha256 = "0si976y8snbmhm96671di65z0rrdyldxd55wjxn2mkn6654nryna"; # If the executable is stripped it does not work dontStrip = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ffa25ada3e7b..3b807c932f0a 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1084,7 +1084,7 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_08 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.08.nix { }); - ocamlPackages_latest = ocamlPackages_4_07; + ocamlPackages_latest = ocamlPackages_4_08; ocamlPackages = ocamlPackages_4_06; } -- cgit 1.4.1 From 9a15d93f07a89bd8463b84b0365f45917971353a Mon Sep 17 00:00:00 2001 From: Travis Athougies Date: Tue, 9 Jul 2019 22:45:33 -0700 Subject: colm: cross-compilation --- pkgs/development/compilers/colm/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index 888750efdf97..237a80280ec8 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, gcc, asciidoc }: +{ stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }: stdenv.mkDerivation rec { name = "colm-${version}"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4"; }; - nativeBuildInputs = [ makeWrapper asciidoc ]; + patches = [ ./cross-compile.patch ]; + + nativeBuildInputs = [ makeWrapper asciidoc autoreconfHook ]; doCheck = true; -- cgit 1.4.1 From 91a14926490a84f00c4092afed317b3faadbcd25 Mon Sep 17 00:00:00 2001 From: Travis Athougies Date: Tue, 9 Jul 2019 22:46:53 -0700 Subject: colm: add cross-compile patch --- pkgs/development/compilers/colm/cross-compile.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 pkgs/development/compilers/colm/cross-compile.patch diff --git a/pkgs/development/compilers/colm/cross-compile.patch b/pkgs/development/compilers/colm/cross-compile.patch new file mode 100644 index 000000000000..470ea23aaf1b --- /dev/null +++ b/pkgs/development/compilers/colm/cross-compile.patch @@ -0,0 +1,13 @@ +--- a/configure.ac 2019-07-09 22:41:03.166948024 -0700 ++++ b/configure.ac 2019-07-09 22:41:16.699948056 -0700 +@@ -40,9 +40,7 @@ + + dnl Choose a default for the build_manual var. If the dist file is present in + dnl the root then default to no, otherwise go for it. +-AC_CHECK_FILES( [$srcdir/DIST], +- [. $srcdir/DIST;], +- [build_manual=yes; ] ) ++build_manual=yes; + + dnl Set to true if the manual should be built. + AM_CONDITIONAL(BUILD_MANUAL, [test "x$build_manual" = "xyes"]) -- cgit 1.4.1 From 780b84189df1e194609c43302bd111cdfff4e51e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 8 Jul 2019 20:29:19 +0300 Subject: cpp-utilities: init at 4.17.1 --- .../libraries/cpp-utilities/default.nix | 27 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/cpp-utilities/default.nix diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix new file mode 100644 index 000000000000..cd16dea56b18 --- /dev/null +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, cppunit }: + +stdenv.mkDerivation rec { + pname = "cpp-utilities"; + version = "4.17.1"; + + src = fetchFromGitHub { + owner = "Martchus"; + repo = pname; + rev = "v${version}"; + sha256 = "12088cwg3jbqipmbn4843w1cgxi1q6vwx47gy042rkfvbk6azhxl"; + }; + + nativeBuildInputs = [ cmake ]; + checkInputs = [ cppunit ]; + # Otherwise, tests fail since the resulting shared object libc++utilities.so is only available in PWD of the make files + checkFlagsArray = [ "LD_LIBRARY_PATH=$(PWD)" ]; + doCheck = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/Martchus/cpp-utilities"; + description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities"; + license = licenses.gpl2; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3943d02499cf..8da5ac0a08fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10168,6 +10168,8 @@ in cppdb = callPackage ../development/libraries/cppdb { }; + cpp-utilities = callPackage ../development/libraries/cpp-utilities { }; + cpp-hocon = callPackage ../development/libraries/cpp-hocon { }; cpp-ipfs-api = callPackage ../development/libraries/cpp-ipfs-api { }; -- cgit 1.4.1 From 7370abcbebd10bf261cd3f9206315d0128abc2f1 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Wed, 10 Jul 2019 10:27:21 +0200 Subject: zabbixctl: init at unstable-2019-07-06 --- pkgs/tools/misc/zabbixctl/default.nix | 25 ++++++++ pkgs/tools/misc/zabbixctl/deps.nix | 111 ++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 138 insertions(+) create mode 100644 pkgs/tools/misc/zabbixctl/default.nix create mode 100644 pkgs/tools/misc/zabbixctl/deps.nix diff --git a/pkgs/tools/misc/zabbixctl/default.nix b/pkgs/tools/misc/zabbixctl/default.nix new file mode 100644 index 000000000000..b74ab51680d1 --- /dev/null +++ b/pkgs/tools/misc/zabbixctl/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "zabbixctl"; + version = "unstable-2019-07-06"; + + goPackagePath = "github.com/kovetskiy/zabbixctl"; + + src = fetchFromGitHub { + owner = "kovetskiy"; + repo = pname; + rev = "f2e856b7ab7d8ff9f494fe9f481bbaef18ea6ff7"; + sha256 = "1lr3g9h3aa2px2kh5b2qcpj3aqyhqwq7kj1s9wifgmri9q7fsdzy"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Most effective way for operating in Zabbix Server"; + homepage = "https://github.com/kovetskiy/zabbixctl"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ mmahut ]; + }; +} diff --git a/pkgs/tools/misc/zabbixctl/deps.nix b/pkgs/tools/misc/zabbixctl/deps.nix new file mode 100644 index 000000000000..2bf015acf5f5 --- /dev/null +++ b/pkgs/tools/misc/zabbixctl/deps.nix @@ -0,0 +1,111 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/jinzhu/configor"; + fetch = { + type = "git"; + url = "https://github.com/jinzhu/configor"; + rev = "9064de4b2535f218bde55dc8de50a3904ef800d0"; + sha256 = "13wd7s2kff3s0bz5mi0m2zcz1r8mwnwhd944gxymzkwij71lhasn"; + }; + } + { + goPackagePath = "github.com/kovetskiy/godocs"; + fetch = { + type = "git"; + url = "https://github.com/kovetskiy/godocs"; + rev = "2d9428f80f3442e07f67daf7ba378cd0ff6cfe24"; + sha256 = "128dlvxqk31crzl9p3ps0nir724cjzxv4lxpgdvsir0wvfp8f83j"; + }; + } + { + goPackagePath = "github.com/kovetskiy/lorg"; + fetch = { + type = "git"; + url = "https://github.com/kovetskiy/lorg"; + rev = "9c6042b7edb0c491dd0722fad91e2b5e833d6b43"; + sha256 = "0j1cm7mni47vraxnyigc55cq0yxw8zdyjmrq2c7vnm5s4kiia8pi"; + }; + } + { + goPackagePath = "github.com/kovetskiy/spinner-go"; + fetch = { + type = "git"; + url = "https://github.com/kovetskiy/spinner-go"; + rev = "00597fd24fe0d8079821b68f71d73b0661401752"; + sha256 = "19qcpnvs61fsk7xgcj5b6s3zksnkc5rk9n5hx73v9ya7m2k7xr2n"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211"; + sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "cc27d85e17cec9768d2ac401ea5d619a9628f16d"; + sha256 = "1y3pkvypkxjrhlnsv8lcyd0c2q8mn5asfny2zi9j2vs77s5bd9qm"; + }; + } + { + goPackagePath = "github.com/reconquest/karma-go"; + fetch = { + type = "git"; + url = "https://github.com/reconquest/karma-go"; + rev = "1094651bd246b1685f7b368e099aba6fca9efd8f"; + sha256 = "0jiayzxwp0h7skg86q58rh58m2imdg3ng2vzpc2bxiz67lzcpk3r"; + }; + } + { + goPackagePath = "github.com/simplereach/timeutils"; + fetch = { + type = "git"; + url = "https://github.com/simplereach/timeutils"; + rev = "1a719258b86a08630289b86902ab16817ba641e9"; + sha256 = "08mf2j0dk07c9p279ydbrjxbjf113azmq0x8vhf7jvldcgjpw3m6"; + }; + } + { + goPackagePath = "github.com/zazab/zhash"; + fetch = { + type = "git"; + url = "https://github.com/zazab/zhash"; + rev = "ad45b89afe7af57319ca32f174e4dabeb00c44e4"; + sha256 = "16b6f70qwfyg0zvbpk0yj5jx4cv2ggkyiqc5nk8n0165z46i62hs"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mgo.v2"; + rev = "9856a29383ce1c59f308dd1cf0363a79b5bef6b5"; + sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba8d7cfede66..e70fe21c63f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2691,6 +2691,8 @@ in zabbix-cli = callPackage ../tools/misc/zabbix-cli { }; + zabbixctl = callPackage ../tools/misc/zabbixctl { }; + zzuf = callPackage ../tools/security/zzuf { }; ### DEVELOPMENT / EMSCRIPTEN -- cgit 1.4.1 From 279a00106290045ab42e7df85edab114b53e13c6 Mon Sep 17 00:00:00 2001 From: SLNOS Date: Mon, 1 Jul 2019 00:00:00 +0000 Subject: firefoxPackages.tor-browser: 8.5.2 -> 8.5.4 --- pkgs/applications/networking/browsers/firefox/packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e7dc84ebda07..93449288075b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -245,16 +245,16 @@ in rec { }; tor-browser-8-5 = tbcommon rec { - ffversion = "60.7.0esr"; - tbversion = "8.5.2"; + ffversion = "60.8.0esr"; + tbversion = "8.5.4"; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-60.7.0esr-8.5-2-slnos" - rev = "b8216328bf6bf1996fcd794d4531689a7c373a2f"; - sha256 = "0zmqam3c91iww33jpfyl6q6wacj20nqkfzyqryalfvnvx3zi0i1q"; + # branch "tor-browser-60.8.0esr-8.5-1-slnos" + rev = "9ec7e4832a68ba3a77f5e8e21dc930a25757f55d"; + sha256 = "10x9h2nm1p8cs0qnd8yjp7ly5raxagqyfjn4sj2y3i86ya5zygb9"; }; patches = [ -- cgit 1.4.1 From b837620e98d3661f2c3cc961ffc604d3bda71f7a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 5 Jul 2019 18:04:45 -0500 Subject: krita: 4.2.1 -> 4.2.2 https://krita.org/en/item/krita-4-2-2-released/ --- pkgs/applications/graphics/krita/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index ca1740807783..cc46ac2d3bb4 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -8,20 +8,13 @@ , python3Packages }: -let - -major = "4.2"; -minor = "1"; - -in - mkDerivation rec { - name = "krita-${version}"; - version = "${major}.${minor}"; + pname = "krita"; + version = "4.2.2"; src = fetchurl { - url = "https://download.kde.org/stable/krita/${major}.${minor}/${name}.tar.gz"; - sha256 = "1jm9kj9cq2nhaqg3kvyb193hhkd6al1gh23fkl54dj88x3fpldim"; + url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz"; + sha256 = "1pzk5bqp3kh22djhvsvmsc7ybirs4hsnkpg1y9677m2gxwbqnnps"; }; nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; -- cgit 1.4.1 From ce2f74df2cade57e74c235292c8b074281903e71 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 10 Jul 2019 12:35:48 +0200 Subject: Revert "systems/doubles.nix: add Apple doubles" The lib tests need to be fixed as well. This unbreaks the tarball job. This reverts commit 00ba557856d6217121e50ea69c251e9458d9dc08. --- lib/systems/doubles.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 39018d045b32..09e9089aa6fd 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -13,11 +13,9 @@ let "i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd" - "x86_64-cygwin" "x86_64-freebsd" "x86_64-linux" + "x86_64-cygwin" "x86_64-darwin" "x86_64-freebsd" "x86_64-linux" "x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris" - "x86_64-darwin" "aarch64-ios" "armv7a-ios" "x86_64-ios" "i686-ios" - "x86_64-windows" "i686-windows" "wasm64-wasi" "wasm32-wasi" -- cgit 1.4.1 From b179b1d7e0491d3819551515d6ac7e45de5d3017 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Tue, 9 Jul 2019 15:02:49 -0700 Subject: cocoapods: 1.7.3 -> 1.7.4 --- pkgs/development/mobile/cocoapods/Gemfile.lock | 8 ++++---- pkgs/development/mobile/cocoapods/gemset.nix | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 1ca395b5d925..758383455e0c 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -9,10 +9,10 @@ GEM tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.7.3) + cocoapods (1.7.4) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.3) + cocoapods-core (= 1.7.4) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,7 +28,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.10.0, < 2.0) - cocoapods-core (1.7.3) + cocoapods-core (1.7.4) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) @@ -59,7 +59,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.10.0) + xcodeproj (1.11.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index e3e2b13b259d..bb4ea396c09c 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -40,10 +40,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c0xh7wh8l34wqiiwwhdakm6zin8xd5svgh63c6pb2pd1d4phhyv"; + sha256 = "1h0cnrxh5k61yfh3f3kdx67gwfkvnvaqgsmwbmqpl7ffbpsg5gsc"; type = "gem"; }; - version = "1.7.3"; + version = "1.7.4"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -51,10 +51,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p76z708fbb61x0m585iaf912f0s3qw0a1mryhpqa2wyrjrlmg31"; + sha256 = "0xbpaisml77q9k5bk5f7hfkzmnjymzczinvhgim34nvwd00rd30c"; type = "gem"; }; - version = "1.7.3"; + version = "1.7.4"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -254,9 +254,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x2ypkxyfsr6k8qy75iy64p6af6b024fqnlmw8qvzzzixmwrr8q7"; + sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; } \ No newline at end of file -- cgit 1.4.1 From 11b8159328358cc90165017a0cc9de3fc18c99d0 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Tue, 9 Jul 2019 15:02:59 -0700 Subject: cocoapods-beta: 1.7.3 -> 1.7.4 --- pkgs/development/mobile/cocoapods/Gemfile-beta.lock | 8 ++++---- pkgs/development/mobile/cocoapods/gemset-beta.nix | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 4783f9a8748b..2c881a5c45a7 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -9,10 +9,10 @@ GEM tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.7.3) + cocoapods (1.7.4) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.3) + cocoapods-core (= 1.7.4) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,7 +28,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.10.0, < 2.0) - cocoapods-core (1.7.3) + cocoapods-core (1.7.4) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) @@ -59,7 +59,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.10.0) + xcodeproj (1.11.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index 142f30615f6c..bd89b448eac2 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -46,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c0xh7wh8l34wqiiwwhdakm6zin8xd5svgh63c6pb2pd1d4phhyv"; + sha256 = "1h0cnrxh5k61yfh3f3kdx67gwfkvnvaqgsmwbmqpl7ffbpsg5gsc"; type = "gem"; }; - version = "1.7.3"; + version = "1.7.4"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p76z708fbb61x0m585iaf912f0s3qw0a1mryhpqa2wyrjrlmg31"; + sha256 = "0xbpaisml77q9k5bk5f7hfkzmnjymzczinvhgim34nvwd00rd30c"; type = "gem"; }; - version = "1.7.3"; + version = "1.7.4"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -292,9 +292,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x2ypkxyfsr6k8qy75iy64p6af6b024fqnlmw8qvzzzixmwrr8q7"; + sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; } \ No newline at end of file -- cgit 1.4.1 From 50464716e3eec4deee6ef8f9a58752eb1a29b16e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 10 Jul 2019 13:20:40 +0200 Subject: fuse3: 3.6.1 -> 3.6.2 --- pkgs/os-specific/linux/fuse/common.nix | 5 +++- pkgs/os-specific/linux/fuse/default.nix | 4 +-- pkgs/os-specific/linux/fuse/fuse3-install.patch | 37 ++++++------------------- 3 files changed, 15 insertions(+), 31 deletions(-) diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index f72b3cac7371..f829f1da424e 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -38,7 +38,10 @@ in stdenv.mkDerivation rec { outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common"; - mesonFlags = stdenv.lib.optional isFuse3 "-Dudevrulesdir=etc/udev/rules.d"; + mesonFlags = stdenv.lib.optionals isFuse3 [ + "-Dudevrulesdir=/udev/rules.d" + "-Duseroot=false" + ]; preConfigure = '' export MOUNT_FUSE_PATH=$out/sbin diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index a4dfda41a0ce..f48e528b486d 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.6.1"; - sha256Hash = "1118r2nx64cpv9s5a6dgh49y0pnjcc5ybpkh5pigxf14bpqa26pb"; + version = "3.6.2"; + sha256Hash = "1cxx94q6zqns1iw5d4g3ll8f78swqxl6h25bpxmqkqsj6c91pzkl"; }; } diff --git a/pkgs/os-specific/linux/fuse/fuse3-install.patch b/pkgs/os-specific/linux/fuse/fuse3-install.patch index 6f938536974a..147bcb439fb8 100644 --- a/pkgs/os-specific/linux/fuse/fuse3-install.patch +++ b/pkgs/os-specific/linux/fuse/fuse3-install.patch @@ -1,37 +1,18 @@ ---- a/util/install_helper.sh 2018-08-31 21:22:34.580563286 +0200 -+++ b/util/install_helper.sh 2018-08-31 21:30:54.837939149 +0200 -@@ -22,30 +22,11 @@ - DESTDIR="${DESTDIR%/}" +--- a/util/install_helper.sh 2019-07-10 12:00:15.984840142 +0200 ++++ b/util/install_helper.sh 2019-07-10 12:28:56.343011401 +0200 +@@ -37,10 +37,10 @@ fi --chown root:root "${DESTDIR}${bindir}/fusermount3" --chmod u+s "${DESTDIR}${bindir}/fusermount3" -- - install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \ - "${DESTDIR}${sysconfdir}/fuse.conf" - -- --if test ! -e "${DESTDIR}/dev/fuse"; then -- mkdir -p "${DESTDIR}/dev" -- mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229 --fi -- install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ - "${DESTDIR}${udevrulesdir}/99-fuse3.rules" -+ "${sysconfdir}/udev/rules.d/99-fuse3.rules" ++ "${sysconfdir}${udevrulesdir}/99-fuse3.rules" install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ - "${DESTDIR}${sysconfdir}/init.d/fuse3" -- -- --if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then -- /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true --else -- echo "== FURTHER ACTION REQUIRED ==" -- echo "Make sure that your init system will start the ${sysconfdir}/init.d/fuse3 init script" --fi -- -- +- "${DESTDIR}/etc/init.d/fuse3" ++ "${sysconfdir}/init.d/fuse3" + + + if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then diff --git a/util/meson.build b/util/meson.build index aa0e734..06d4378 100644 --- a/util/meson.build -- cgit 1.4.1 From 103c4f41fedfe51e97f7dc09dafaf6a696eaa35d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 10 Jul 2019 07:28:07 -0400 Subject: linux: 4.14.132 -> 4.14.133 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 30750c9f5d66..d3d2e2728a2d 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.132"; + version = "4.14.133"; # 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 = "0c7k5yl2h929kvbzqij0p56myp9v14im4s72wky5d9idfadg71ns"; + sha256 = "005pg4f8l2qz8g6hd71pj567z91hwjwdwb37h4dbb3fj6kjl965y"; }; } // (args.argsOverride or {})) -- cgit 1.4.1 From 07f40d8f535777c90a5e0fded22225d2a3774524 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 10 Jul 2019 07:28:13 -0400 Subject: linux: 4.19.57 -> 4.19.58 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index f38196fef7d1..b9d05c9fe6e8 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.57"; + version = "4.19.58"; # 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 = "11rz1pfphc4zkn3fbfavn1764g3ymp4b1bfnr7b630w8smcmfz1j"; + sha256 = "1waqk2ggnnaqa5pxhdbvxkkchvxxz9pbkqnr5pn5rj6h2v5644az"; }; } // (args.argsOverride or {})) -- cgit 1.4.1 From d21b26ac54230e361b83a1c6a08969d59640d80d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 10 Jul 2019 07:28:19 -0400 Subject: linux: 4.4.184 -> 4.4.185 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index a80e578c75b0..1e3da9085196 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.184"; + version = "4.4.185"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1jn3mwnfcvhnn0bqiyabkqii3rd6w5b982w3i085qj42q0pj6hv5"; + sha256 = "1ll694m5193dmwn8ys4sf2p6a6njd5pm38v862ih1iw7l3vj0l3s"; }; } // (args.argsOverride or {})) -- cgit 1.4.1 From d863c484bb5508f3a4a2a8098101196e2c5813f7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 10 Jul 2019 07:28:28 -0400 Subject: linux: 4.9.184 -> 4.9.185 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 4f054dcc6657..d611e4cf71e6 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.184"; + version = "4.9.185"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1bwzmmpc7k9n7p2s383pipdjc3hvqfbbacaxk7gdw9856pai8c83"; + sha256 = "16z3ijfzffpkp4mj42j3j8zbnpba1a67kd5cdqwb28spf32a66vc"; }; } // (args.argsOverride or {})) -- cgit 1.4.1 From f9796375213654758077e64b3a789596d116f487 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 10 Jul 2019 07:28:37 -0400 Subject: linux: 5.1.16 -> 5.1.17 --- pkgs/os-specific/linux/kernel/linux-5.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix index 85dc12c6b044..e0e64fdc5d4e 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.16"; + version = "5.1.17"; # 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 = "0gms4zkx97njzk1czsnih6jj9f6knismixxndn1h11vq7sz5agla"; + sha256 = "0gf4jqmq6b66jrlygmvn2z8xif3n83yq85jldbm3r257crww6dar"; }; } // (args.argsOverride or {})) -- cgit 1.4.1 From 95ce3f54ddee7551646cf589f5e056e5eb2463ee Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 10 Jul 2019 09:16:28 -0400 Subject: vscode: 1.36.0 -> 1.36.1 --- pkgs/applications/editors/vscode/vscode.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index c8db515e47df..438292b7683c 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,13 +11,13 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "x86_64-linux" = "02h71b9m9w4nc8g9iy2kafg041brli4zwv7pv6i1qg6p5cf2jdfx"; - "x86_64-darwin" = "1awq0rwiizwbjqf7crv59qr7m7rmgpfba0b4qx2bpx1mn25fmq56"; + "x86_64-linux" = "1ck13xpnfklfc81jd8d5md09fcp0gjypacdqj276mzhr5mig29cd"; + "x86_64-darwin" = "0xpzm372swv0by22saxib16fvvvfjr7d68aj3l5dsl5c9a8v23qj"; }.${system}; in callPackage ./generic.nix rec { - version = "1.36.0"; + version = "1.36.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; -- cgit 1.4.1 From 269469122f94c8f1a2c82481b8cec5632725bfbd Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 10 Jul 2019 09:16:39 -0400 Subject: vscodium: 1.36.0 -> 1.36.1 --- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index f651ee0653d5..fbcc6d0c7374 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,13 +11,13 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "x86_64-linux" = "09vmq87az0f91xwyfby85pnn4mg0rlf7pyvs5bkrxv0r8jxxfpq7"; - "x86_64-darwin" = "16yzzmlf3v9aj7dyglqjxdksabv0cc98w6kdv5rbfw865hj4bbck"; + "x86_64-linux" = "1ay4zvkbln2wf2j1d71mn13b6p2fqvzgz45mzrgaqwsszhbg4xzp"; + "x86_64-darwin" = "17r9krb1qd92ybx078hkw9zlyym6kbnmbl91vjdilsq77bkf9jmw"; }.${system}; in callPackage ./generic.nix rec { - version = "1.36.0"; + version = "1.36.1"; pname = "vscodium"; executableName = "codium"; -- cgit 1.4.1 From dc336293a166a474d236256f9e196c435d5266a5 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 10 Jul 2019 08:01:45 -0700 Subject: doc: fix after snaptools merge --- doc/functions/snap/example-firefox.nix | 28 ++++++++++++++++++++++++++++ doc/functions/snap/example-hello.nix | 12 ++++++++++++ doc/functions/snaptools.xml | 4 ++-- pkgs/build-support/snap/example-firefox.nix | 28 ---------------------------- pkgs/build-support/snap/example-hello.nix | 12 ------------ 5 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 doc/functions/snap/example-firefox.nix create mode 100644 doc/functions/snap/example-hello.nix delete mode 100644 pkgs/build-support/snap/example-firefox.nix delete mode 100644 pkgs/build-support/snap/example-hello.nix diff --git a/doc/functions/snap/example-firefox.nix b/doc/functions/snap/example-firefox.nix new file mode 100644 index 000000000000..d58c98a65a2e --- /dev/null +++ b/doc/functions/snap/example-firefox.nix @@ -0,0 +1,28 @@ +let + inherit (import { }) snapTools firefox; +in snapTools.makeSnap { + meta = { + name = "nix-example-firefox"; + summary = firefox.meta.description; + architectures = [ "amd64" ]; + apps.nix-example-firefox = { + command = "${firefox}/bin/firefox"; + plugs = [ + "pulseaudio" + "camera" + "browser-support" + "avahi-observe" + "cups-control" + "desktop" + "desktop-legacy" + "gsettings" + "home" + "network" + "mount-observe" + "removable-media" + "x11" + ]; + }; + confinement = "strict"; + }; +} diff --git a/doc/functions/snap/example-hello.nix b/doc/functions/snap/example-hello.nix new file mode 100644 index 000000000000..123da80c5477 --- /dev/null +++ b/doc/functions/snap/example-hello.nix @@ -0,0 +1,12 @@ +let + inherit (import { }) snapTools hello; +in snapTools.makeSnap { + meta = { + name = "hello"; + summary = hello.meta.description; + description = hello.meta.longDescription; + architectures = [ "amd64" ]; + confinement = "strict"; + apps.hello.command = "${hello}/bin/hello"; + }; +} diff --git a/doc/functions/snaptools.xml b/doc/functions/snaptools.xml index a951c36730d3..d0e3efdf6c67 100644 --- a/doc/functions/snaptools.xml +++ b/doc/functions/snaptools.xml @@ -38,7 +38,7 @@ The following expression packages GNU Hello as a Snapcraft snap. - + nix-build this expression and install it with snap install ./result --dangerous. @@ -57,7 +57,7 @@ example uses Firefox as an example, because it is one of the most complicated programs we could package. - + nix-build this expression and install it with snap install ./result --dangerous. diff --git a/pkgs/build-support/snap/example-firefox.nix b/pkgs/build-support/snap/example-firefox.nix deleted file mode 100644 index d58c98a65a2e..000000000000 --- a/pkgs/build-support/snap/example-firefox.nix +++ /dev/null @@ -1,28 +0,0 @@ -let - inherit (import { }) snapTools firefox; -in snapTools.makeSnap { - meta = { - name = "nix-example-firefox"; - summary = firefox.meta.description; - architectures = [ "amd64" ]; - apps.nix-example-firefox = { - command = "${firefox}/bin/firefox"; - plugs = [ - "pulseaudio" - "camera" - "browser-support" - "avahi-observe" - "cups-control" - "desktop" - "desktop-legacy" - "gsettings" - "home" - "network" - "mount-observe" - "removable-media" - "x11" - ]; - }; - confinement = "strict"; - }; -} diff --git a/pkgs/build-support/snap/example-hello.nix b/pkgs/build-support/snap/example-hello.nix deleted file mode 100644 index 123da80c5477..000000000000 --- a/pkgs/build-support/snap/example-hello.nix +++ /dev/null @@ -1,12 +0,0 @@ -let - inherit (import { }) snapTools hello; -in snapTools.makeSnap { - meta = { - name = "hello"; - summary = hello.meta.description; - description = hello.meta.longDescription; - architectures = [ "amd64" ]; - confinement = "strict"; - apps.hello.command = "${hello}/bin/hello"; - }; -} -- cgit 1.4.1 From c120141888a99949f47853d6a485b047c170079e Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Wed, 10 Jul 2019 23:48:31 +0800 Subject: kube-router: 0.2.5 -> 0.3.1 --- .../networking/cluster/kube-router/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index 2a43c23e73aa..a3cb55ce329c 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -1,17 +1,16 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "kube-router-${version}"; - version = "0.2.5"; - rev = "v${version}"; + pname = "kube-router"; + version = "0.3.1"; goPackagePath = "github.com/cloudnativelabs/kube-router"; src = fetchFromGitHub { - inherit rev; owner = "cloudnativelabs"; - repo = "kube-router"; - sha256 = "1j6q6kg4qj75v2mdy9ivvwq8mx9fpdf0w08959l8imrp5byd56wv"; + repo = pname; + rev = "v${version}"; + sha256 = "06azrghcxp6n4bvrqxpwhmg60qk4jqcrkl1lh1rardlzhl71lk1h"; }; buildFlagsArray = '' @@ -22,7 +21,7 @@ buildGoPackage rec { ${goPackagePath}/pkg/cmd.buildDate=Nix ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.kube-router.io/"; description = "All-in-one router, firewall and service proxy for Kubernetes"; license = licenses.asl20; -- cgit 1.4.1 From 1bc8cd8ff5fb4b6756bf23289693d8e24f7fa07f Mon Sep 17 00:00:00 2001 From: uHOOCCOOHu Date: Thu, 11 Jul 2019 00:15:44 +0800 Subject: tdesktop: 1.7.10 -> 1.7.14 --- .../telegram/tdesktop/default.nix | 8 ++++---- .../telegram/tdesktop/generic.nix | 22 +++++++++++++++------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 14289a66e259..3e5294815084 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,11 +4,11 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.7.10"; - sha256Hash = "04if7siv0ib5sbdkdc7vwmxyjy3fnijrshgc8i8m79marfkn3wac"; + version = "1.7.14"; + sha256Hash = "1bw804a9kffmn23wv0570wihbvfm7jy9cqmxlv196f4j7bw7zkv3"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - archPatchesRevision = "480743"; - archPatchesHash = "0jfyp642l2850yzgrw3irq8bn6vl44rx2693c5cshwbihd212af7"; + archPatchesRevision = "487779"; + archPatchesHash = "0f09hvimb66xqksb2v0zc4ryshx7y7z0rafzjd99x37rpib9f3kq"; }; in { stable = mkTelegram stableVersion; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index ef9367553ff3..df06dc49eef4 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -28,13 +28,17 @@ mkDerivation rec { sha256 = archPatchesHash; }; - # TODO: libtgvoip.patch no-gtk2.patch - # TODO: Avoid tdesktop_lottie_animation_qtdebug.patch and tdesktop_qtlottie_qtdebug.patch - patches = [ "${archPatches}/tdesktop.patch" "${archPatches}/tdesktop_lottie_animation_qtdebug.patch" ]; + patches = [ + "${archPatches}/tdesktop.patch" + "${archPatches}/no-gtk2.patch" + # "${archPatches}/Use-system-wide-font.patch" + "${archPatches}/tdesktop_lottie_animation_qtdebug.patch" + "${archPatches}/issue6219.patch" + ]; postPatch = '' substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \ - --replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"' + --replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"' substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp \ --replace '"notify"' '"${libnotify}/lib/libnotify.so"' ''; @@ -75,12 +79,14 @@ mkDerivation rec { CPPFLAGS = NIX_CFLAGS_COMPILE; preConfigure = '' + patch -R -Np1 -i "${archPatches}/demibold.patch" + pushd "Telegram/ThirdParty/libtgvoip" patch -Np1 -i "${archPatches}/libtgvoip.patch" popd - pushd "Telegram/ThirdParty/qtlottie" - patch -Np1 -i "${archPatches}/tdesktop_qtlottie_qtdebug.patch" - popd + + # disable static-qt for rlottie + sed "/RLOTTIE_WITH_STATIC_QT/d" -i "Telegram/gyp/lib_rlottie.gyp" sed -i Telegram/gyp/telegram_linux.gypi \ -e 's,/usr,/does-not-exist,g' \ @@ -118,6 +124,8 @@ mkDerivation rec { export ASM=$(type -p gcc) ''; + cmakeFlags = [ "-UTDESKTOP_OFFICIAL_TARGET" ]; + installPhase = '' install -Dm755 Telegram $out/bin/telegram-desktop -- cgit 1.4.1 From 7d95bc0c85af1dd3650164757c2e2d511638f459 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 10 Jul 2019 12:21:22 -0400 Subject: nixos/libinput: use `types.lines` for additionalOptions --- nixos/modules/services/x11/hardware/libinput.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index 58fe702d4969..a0a5e2656852 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -178,7 +178,7 @@ in { }; additionalOptions = mkOption { - type = types.str; + type = types.lines; default = ""; example = '' -- cgit 1.4.1 From 4dcd65aa993d908a32a71fe69156d4021fcf887f Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Thu, 11 Jul 2019 00:36:06 +0800 Subject: fzf: 0.17.5 -> 0.18.0 --- pkgs/tools/misc/fzf/default.nix | 51 +++++++++++++------------ pkgs/tools/misc/fzf/deps.nix | 84 ----------------------------------------- 2 files changed, 26 insertions(+), 109 deletions(-) delete mode 100644 pkgs/tools/misc/fzf/deps.nix diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index de211d1d1c4e..66da4f53099a 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,27 +1,24 @@ -{ stdenv, ncurses, buildGoPackage, fetchFromGitHub, writeText, runtimeShell }: +{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, }: -buildGoPackage rec { - name = "fzf-${version}"; - version = "0.17.5"; - rev = "${version}"; - - goPackagePath = "github.com/junegunn/fzf"; +buildGoModule rec { + pname = "fzf"; + version = "0.18.0"; src = fetchFromGitHub { - inherit rev; owner = "junegunn"; - repo = "fzf"; - sha256 = "04kalm25sn5k24nrdmbkafp4zvxpm2l3rxchvccl0kz0j3szh62z"; + repo = pname; + rev = version; + sha256 = "0pwpr4fpw56yzzkcabzzgbgwraaxmp7xzzmap7w1xsrkbj7dl2xl"; }; - outputs = [ "bin" "out" "man" ]; + modSha256 = "0xc4166d74ix5nzjphrq4rgw7qpskz05ymzl77i2qh2nhbdb53p0"; + + outputs = [ "out" "man" ]; fishHook = writeText "load-fzf-keybindings.fish" "fzf_key_bindings"; buildInputs = [ ncurses ]; - goDeps = ./deps.nix; - patchPhase = '' sed -i -e "s|expand(':h:h')|'$bin'|" plugin/fzf.vim @@ -33,30 +30,34 @@ buildGoPackage rec { ''; preInstall = '' - mkdir -p $bin/share/fish/vendor_functions.d $bin/share/fish/vendor_conf.d - cp $src/shell/key-bindings.fish $bin/share/fish/vendor_functions.d/fzf_key_bindings.fish - cp ${fishHook} $bin/share/fish/vendor_conf.d/load-fzf-key-bindings.fish + mkdir -p $out/share/fish/{vendor_functions.d,vendor_conf.d} + cp $src/shell/key-bindings.fish $out/share/fish/vendor_functions.d/fzf_key_bindings.fish + cp ${fishHook} $out/share/fish/vendor_conf.d/load-fzf-key-bindings.fish ''; postInstall = '' - cp $src/bin/fzf-tmux $bin/bin + name="${pname}-${version}" + + cp $src/bin/fzf-tmux $out/bin + mkdir -p $man/share/man cp -r $src/man/man1 $man/share/man - mkdir -p $out/share/vim-plugins/${name} - cp -r $src/plugin $out/share/vim-plugins/${name} - cp -R $src/shell $bin/share/fzf - cat <