From 419b7c6bbd0a3a1eb02d140ed8f204b1acf6afe7 Mon Sep 17 00:00:00 2001 From: David Leung Date: Mon, 1 Apr 2019 09:48:12 +0800 Subject: wasm-pack: init at 0.8.1 wasm-pack is a workflow tool maintained by the Rust and WebAssembly Working Group to make working with Rust-generated WebAssembly packages easier to work with. --- pkgs/development/tools/wasm-pack/default.nix | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/development/tools/wasm-pack/default.nix (limited to 'pkgs/development') diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix new file mode 100644 index 000000000000..b2bee738344d --- /dev/null +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +, pkgconfig +, openssl +}: + +rustPlatform.buildRustPackage rec { + name = "wasm-pack-${version}"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "rustwasm"; + repo = "wasm-pack"; + rev = "v${version}"; + sha256 = "1z66m16n4r16zqmnv84a5jndr5x6mdqdq4b1wq929sablwqd2rl4"; + }; + + cargoSha256 = "1xdx0gjqd4zyhnp72hz88rdmgry1m7rcw2j73lh67vp08z74y54y"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ]; + + # Tests fetch external resources and build artifacts. + # Disabled to work with sandboxing + doCheck = false; + + meta = with stdenv.lib; { + description = "A utility that builds rust-generated WebAssembly package"; + homepage = https://github.com/rustwasm/wasm-pack; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = [ maintainers.dhkl ]; + platforms = platforms.all; + }; +} -- cgit 1.4.1 From 1bf10f920ed543c14b36338e64c0a96dd045cfa2 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 1 May 2019 12:12:15 +0200 Subject: gitlab-runner: 11.9.2 -> 11.10.1 --- .../tools/continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index c75baf454b34..a8f4336cf71e 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.9.2"; + version = "11.10.1"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "10zmaywq1vzch4a6zdvnm9kgil9ankc9napix9s9fw45wc0lw01p"; + sha256 = "120gpyim54mc8z84gzpbms5hkg2xg4sgzdvkrn1fis9myvd55bav"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "0845ylhb3i3jmi5q6aaix4hw9zdb83v5fhvif0xvvi2m7irg06lf"; + sha256 = "0qfqsi1fm94sxv7g975fw0av871f677rp48yv8q5669ipm16n9qk"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "00k4myca2djd6h3i83vjndahm5q1rnlkq0p69dhl5jbldwy614ph"; + sha256 = "1nxv783rdzdwm0qq3li893p7q3n8gg7abla2961f3n735gjlnibx"; }; patches = [ ./fix-shell-path.patch ]; -- cgit 1.4.1 From b8c99fb0eb04b0f4cf921f2ee5ee1596cc41c136 Mon Sep 17 00:00:00 2001 From: klntsky Date: Wed, 1 May 2019 16:22:25 +0300 Subject: pax-rs: fix missing Cargo.lock --- maintainers/maintainer-list.nix | 2 +- pkgs/development/tools/pax-rs/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4f6e9b1084ff..7d2955d02f6a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2555,7 +2555,7 @@ klntsky = { email = "klntsky@gmail.com"; name = "Vladimir Kalnitsky"; - github = "8084"; + github = "klntsky"; }; kmeakin = { email = "karlwfmeakin@gmail.com"; diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index 3a4f35c0412b..7c52a13b7e72 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -26,7 +26,7 @@ buildRustPackage rec { }; cargo-lock = fetchurl { - url = "https://gist.github.com/8084/c7863424d7df0c379782015f6bb3b399/raw/1cf7481e33984fd1510dc77ed677606d08fa8eb6/Cargo.lock"; + url = "https://gist.github.com/klntsky/c7863424d7df0c379782015f6bb3b399/raw/1cf7481e33984fd1510dc77ed677606d08fa8eb6/Cargo.lock"; sha256 = "0ff1b64b99cbca1cc2ceabcd2e4f7bc3411e3a2a9fbb9db2204d9240fe38ddeb"; }; in -- cgit 1.4.1 From a3af5be304c85f790cac9060f5b269f754d44548 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 09:48:06 -0700 Subject: opencascade-occt: 7.3.0p2 -> 7.3.0p3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/opencascade-occt/versions --- pkgs/development/libraries/opencascade-occt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/development/libraries/opencascade-occt/default.nix index d57c10b41e95..2d1e0ffb2005 100644 --- a/pkgs/development/libraries/opencascade-occt/default.nix +++ b/pkgs/development/libraries/opencascade-occt/default.nix @@ -11,7 +11,7 @@ , doxygen }: -let version = "7.3.0p2"; +let version = "7.3.0p3"; commit = "V${builtins.replaceStrings ["."] ["_"] version}"; in stdenv.mkDerivation { @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { name = "occt-${commit}.tar.gz"; url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; - sha256 = "0nc9k1nqpj0n99pr7qkva79irmqhh007dffwghiyzs031zhd7i6w"; + sha256 = "0k9c3ypcnjcilq1dhsf6xxbd52gyq4h5rchvp30k3c8ph4ris5pz"; }; nativeBuildInputs = [ cmake ]; -- cgit 1.4.1 From 9402d2a01bcc64e3920460b121a14b5d4dcb7d03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 10:22:12 -0700 Subject: osl: 1.10.2 -> 1.10.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/openshadinglanguage/versions --- pkgs/development/compilers/osl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index ddfd5d0a3fdf..a498eafd4254 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec { # In theory this could use GCC + Clang rather than just Clang, # but https://github.com/NixOS/nixpkgs/issues/29877 stops this name = "openshadinglanguage-${version}"; - version = "1.10.2"; + version = "1.10.4"; src = fetchFromGitHub { owner = "imageworks"; repo = "OpenShadingLanguage"; - rev = "Release-1.10.2"; - sha256 = "1549hav5nd67a3cmhbalyaqhs39dh7w0nilf91pypnadrl1g03k7"; + rev = "Release-1.10.4"; + sha256 = "0qarxlm139y5sb9dd9rrljb2xnz8mvyfj497via6yqgwy90zr26g"; }; cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; -- cgit 1.4.1 From 322a287867d78aa024a6533c5d416d2e88cc4ad5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 22:28:51 -0700 Subject: python37Packages.google_cloud_storage: 1.14.0 -> 1.15.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-google-cloud-storage/versions --- pkgs/development/python-modules/google_cloud_storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index 9d6461168d4e..aab9f827da0f 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "aef243b533144c11c9ff750565c43dffe5445debb143697002edb6205f64a437"; + sha256 = "13b9ah54z6g3w8p74a1anmyz84nrxy27snqv6vp95wsizp8zwsyn"; }; checkInputs = [ pytest mock ]; -- cgit 1.4.1 From 1039e9a9c9b2bfa7405d5eb26e91e87c4006f95b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 01:07:31 -0700 Subject: python37Packages.pyatspi: 2.32.0 -> 2.32.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/python3.7-pyatspi/versions --- pkgs/development/python-modules/pyatspi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 20b391311355..693477d20c08 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyatspi"; - version = "2.32.0"; + version = "2.32.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jfmm5684sfb035ihvla75gxz4cls5d2vnf0s02y6dw7s12zbb8a"; + sha256 = "1283cbwd2kacgdij96xk26721f6amyzdhy2py11kdj5cprdlm5c4"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From 35c8b6ea332050eb5e4721e4b2c7768512031c55 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 02:03:45 -0700 Subject: python37Packages.pytest-tornado: 0.6.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-pytest-tornado/versions --- pkgs/development/python-modules/pytest-tornado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix index 53e1fce493d1..c03590f8de88 100644 --- a/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/pkgs/development/python-modules/pytest-tornado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-tornado"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0ndwjsad901km7zw8xxj3igjff651hg1pjcmv5vqx458xhnmbfqw"; + sha256 = "0jv7jhq6ddhsmnz67vc76r4kwac9k5a142968zppyw9av6qalbl4"; }; # package has no tests -- cgit 1.4.1 From 961b0c77b7ad4373a73e3c1566aec8f5d13c80dd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 04:19:04 -0700 Subject: python37Packages.twilio: 6.26.1 -> 6.26.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/python3.7-twilio/versions --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 9c20226fea05..f8fbf8e49f4a 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.26.1"; + version = "6.26.2"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "1ly22ah487jkq0my1l3c6hbx24fgganjhxrlrcw5jfc80qmgd3hd"; + sha256 = "0z0ahbckh5calwgkmd493znixclhjjrly8jfymhwlw6g0g79kavw"; }; buildInputs = [ nose mock ]; -- cgit 1.4.1 From cf6a8043601ce881686e1b0891e6bf3fc89a1476 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 04:41:19 -0700 Subject: python37Packages.vega: 2.0.1 -> 2.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-vega/versions --- pkgs/development/python-modules/vega/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 25acc4f88bce..adbcf539494a 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "vega"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "097jlh1xarnqmcnym5jkfa6rg2f0i6b17v9pck2242axgyi692rm"; + sha256 = "0lshwsvi242m0ybrqjvbag73x1mrb31w2jq3lnklqyzry153xfdb"; }; buildInputs = [ pytest ]; -- cgit 1.4.1 From 942a86de9f67192aa7df238d5ef16958ce492f98 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 05:18:50 -0700 Subject: qbs: 1.12.2 -> 1.13.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/qbs/versions --- pkgs/development/tools/build-managers/qbs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 3c5a485e36fc..196a5d2a7fc9 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "qbs-${version}"; - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "0spkkq7nmh27rbx61p23fzkxffx3qdhjqw95pqgsbc76xczd45sv"; + sha256 = "12zzbhddsgfxyzglknvim0bb7rrnifawnx18g35g1105ybfak607"; }; nativeBuildInputs = [ qmake ]; -- cgit 1.4.1 From c82b7fdd5e72f482d3ef4126ca9b05ac58eb5fbb Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Thu, 2 May 2019 19:04:38 +0200 Subject: mdds: 1.3.1 -> 1.4.3 Changelog: https://gitlab.com/mdds/mdds/blob/1.4.3/CHANGELOG --- pkgs/development/libraries/mdds/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 3b0a0441cc4e..16502ca4e612 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, boost }: stdenv.mkDerivation rec { - version = "1.3.1"; - name = "mdds-${version}"; + pname = "mdds"; + version = "1.4.3"; src = fetchurl { - url = "https://kohei.us/files/mdds/src/mdds-${version}.tar.bz2"; - sha256 = "18g511z1lgfxrga2ld9yr95phmyfbd3ymbv4q5g5lyjn4ljcvf6w"; + url = "https://kohei.us/files/${pname}/src/${pname}-${version}.tar.bz2"; + sha256 = "10cw6irdm6d15nxnys2v5akp8yz52qijpcjvw0frwq7nz5d3vki5"; }; postInstall = '' - mkdir -p "$out/lib/pkgconfig" - cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig" + mkdir -p "$out/lib/pkgconfig" + cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig" ''; checkInputs = [ boost ]; -- cgit 1.4.1 From c6e9b160786cd2e0bb63503997bfe8afb1bbcf67 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 May 2019 05:39:22 -0700 Subject: qpdf: 8.4.0 -> 8.4.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/qpdf/versions --- pkgs/development/libraries/qpdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 30383dda50cf..156a8c4c15cb 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }: -let version = "8.4.0"; +let version = "8.4.1"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "1864p952m8vzxk6v500a42psbqj2g2gyli3d3zj6h33hzwxqy09r"; + sha256 = "1fsfy38dnm9cy1j40jw5x8vn84l6f2kgb68rdjl0wxignfw05z87"; }; nativeBuildInputs = [ perl ]; -- cgit 1.4.1 From 0d2b66dff20609e9d8888558def28a173aa85099 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 2 May 2019 19:29:32 -0500 Subject: liburing: bump, fix version (1.0.0pre92_7b989f3) I accidentally got the number of commits wrong in the previous prerelease version string. This is now fixed. Generally, this would result in functions like builtins.compareVersions to give incorrect results, so 'nix-env -u' doesn't work. But I'm justifying it here, because: most people use it as a library, so the hash change is all that matters. Plus, I only authored this a week or so ago in upstream, so this change is fast enough that I think people will be fine with it and can work around, especially since it's unreleased in any stable channel. This also bumps the library to the newest version, which contains some bugfixes, and now installs the manpages into the $man output for us. Signed-off-by: Austin Seipp --- pkgs/development/libraries/liburing/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index 143919d148e5..c90e0ee009e8 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "liburing-${version}"; - version = "1.0.0pre821_${builtins.substring 0 7 src.rev}"; + version = "1.0.0pre92_${builtins.substring 0 7 src.rev}"; src = fetchgit { url = "http://git.kernel.dk/liburing"; - rev = "39e0ebd4fc66046bf733a47aaa899a556093ebc6"; - sha256 = "00c72fizxmwxd2jzmlzi4l82cw7h75lfpkkwzwcjpw9zdg9w0ci7"; + rev = "7b989f34191302011b5b49bf5b26b36862d54056"; + sha256 = "12kfqvwzxksmsm8667a1g4vxr6xsaq63cz9wrfhwq6hrsv3ynydc"; }; enableParallelBuilding = true; @@ -19,13 +19,12 @@ stdenv.mkDerivation rec { [ "prefix=$(out)" "includedir=$(dev)/include" "libdir=$(lib)/lib" + "mandir=$(man)/share/man" ]; - # Copy the examples into $out and man pages into $man. This should be handled - # by the build system in the future and submitted upstream. + # Copy the examples into $out. postInstall = '' - mkdir -p $out/bin $man/share/man/man2/ - cp -R ./man/* $man/share/man/man2 + mkdir -p $out/bin cp ./examples/io_uring-cp examples/io_uring-test $out/bin ''; -- cgit 1.4.1 From 7c6679d787d5d551b4906829e2406e33c04e35d9 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Fri, 3 May 2019 02:54:50 +0800 Subject: rustup: 1.18.1 -> 1.18.2 --- pkgs/development/tools/rust/rustup/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 3eb0760b2220..d6c5718d3ec6 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -1,25 +1,25 @@ { stdenv, lib, runCommand, patchelf , fetchFromGitHub, rustPlatform -, pkgconfig, curl, Security }: +, pkgconfig, curl, Security, CoreServices }: rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.18.1"; + version = "1.18.2"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup.rs"; rev = version; - sha256 = "0932n708ikxzjv7y78zcrnnnps3rgimsnpaximhm9vmjjnkdgm7x"; + sha256 = "0lyn06vzp5406sjng7msifigkal2lafppqjbdnigx8yvgxqgd06f"; }; - cargoSha256 = "0kw8a9prqjf939g0h8ryyhlm1n84fwdycvl0nkykkwlfqd6hh9hb"; + cargoSha256 = "0yxjy1kls80fcpwskklmihkqva16s6mawa8rdxc3zz8g588am03c"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ curl - ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; cargoBuildFlags = [ "--features no-self-update" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6fe00d164ef7..5664c7f77310 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7856,7 +7856,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; rustup = callPackage ../development/tools/rust/rustup { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; -- cgit 1.4.1 From 9a0596ee9738d8e23f9b8d628604c3a6c2517613 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Fri, 3 May 2019 12:48:14 +0200 Subject: mikutter: 3.5.13 -> 3.8.7 (#60808) --- .../networking/instant-messengers/mikutter/Gemfile | 9 +- .../instant-messengers/mikutter/Gemfile.lock | 102 ++++----- .../mikutter/core/plugin/gtk/Gemfile | 2 +- .../mikutter/core/plugin/uitranslator/Gemfile | 3 +- .../instant-messengers/mikutter/default.nix | 24 ++- .../instant-messengers/mikutter/gemset.nix | 229 ++++++++++++++++----- .../instant-messengers/mikutter/shell.nix | 18 -- .../ruby-modules/gem-config/default.nix | 24 ++- 8 files changed, 277 insertions(+), 134 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/mikutter/shell.nix (limited to 'pkgs/development') diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile index 0eed9808ab4f..3ebd745e4f1a 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile +++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile @@ -7,17 +7,20 @@ def source(url) source 'https://rubygems.org' +ruby '>= 2.3.0' + group :default do gem 'oauth', '>= 0.5.1' gem 'json_pure', '~> 1.8' - gem 'addressable', '~> 2.3' + gem 'addressable', '>= 2.5.2', '< 2.6' + gem 'diva', '>= 0.3.2', '< 2.0' gem 'memoist', '>= 0.16', '< 0.17' gem 'ruby-hmac', '~> 0.4' gem 'typed-array', '~> 0.1' gem 'delayer', '~> 0.0' gem 'pluggaloid', '>= 1.1.1', '< 2.0' - gem 'delayer-deferred', '>= 1.0.4', '< 1.1' - gem 'twitter-text', '>= 1.14.6' + gem 'delayer-deferred', '>= 2.0', '< 3.0' + gem 'twitter-text', '>= 2.1.0' end group :test do diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock index 69530be4a446..2e1f2fbd3820 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock +++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock @@ -3,75 +3,78 @@ GEM specs: addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - atk (3.1.9) - glib2 (= 3.1.9) - cairo (1.15.10) + atk (3.3.2) + glib2 (= 3.3.2) + cairo (1.16.4) native-package-installer (>= 1.0.3) pkg-config (>= 1.2.2) - cairo-gobject (3.1.9) - cairo - glib2 (= 3.1.9) + cairo-gobject (3.3.2) + cairo (>= 1.16.2) + glib2 (= 3.3.2) crack (0.4.3) safe_yaml (~> 1.0.0) delayer (0.0.2) - delayer-deferred (1.0.4) + delayer-deferred (2.0.0) delayer (>= 0.0.2, < 0.1) - gdk_pixbuf2 (3.1.9) - gio2 (= 3.1.9) - gettext (3.0.9) + diva (0.3.2) + addressable (>= 2.5, < 2.6) + gdk_pixbuf2 (3.3.2) + gio2 (= 3.3.2) + gettext (3.2.9) locale (>= 2.0.5) - text - gio2 (3.1.9) - glib2 (= 3.1.9) - gobject-introspection (= 3.1.9) - glib2 (3.1.9) + text (>= 1.3.0) + gio2 (3.3.2) + gobject-introspection (= 3.3.2) + glib2 (3.3.2) native-package-installer (>= 1.0.3) pkg-config (>= 1.2.2) - gobject-introspection (3.1.9) - glib2 (= 3.1.9) - gtk2 (3.1.9) - atk (= 3.1.9) - gdk_pixbuf2 (= 3.1.9) - pango (= 3.1.9) - hashdiff (0.3.7) + gobject-introspection (3.3.2) + glib2 (= 3.3.2) + gtk2 (3.3.2) + atk (= 3.3.2) + gdk_pixbuf2 (= 3.3.2) + pango (= 3.3.2) + hashdiff (0.3.9) httpclient (2.8.3) + idn-ruby (0.1.0) instance_storage (1.0.0) + irb (1.0.0) json_pure (1.8.6) locale (2.1.2) memoist (0.16.0) metaclass (0.0.4) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) mocha (0.14.0) metaclass (~> 0.0.1) - moneta (1.0.0) - native-package-installer (1.0.4) - nokogiri (1.8.1) - mini_portile2 (~> 2.3.0) - oauth (0.5.3) - pango (3.1.9) - cairo (>= 1.14.0) - cairo-gobject (= 3.1.9) - gobject-introspection (= 3.1.9) - pkg-config (1.2.8) - pluggaloid (1.1.1) + moneta (1.1.1) + native-package-installer (1.0.7) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + oauth (0.5.4) + pango (3.3.2) + cairo-gobject (= 3.3.2) + gobject-introspection (= 3.3.2) + pkg-config (1.3.7) + pluggaloid (1.1.2) delayer instance_storage (>= 1.0.0, < 2.0.0) - power_assert (1.1.1) - public_suffix (3.0.0) + power_assert (1.1.4) + public_suffix (3.0.3) rake (10.5.0) ruby-hmac (0.4.0) - ruby-prof (0.16.2) - safe_yaml (1.0.4) - test-unit (3.2.6) + ruby-prof (0.17.0) + safe_yaml (1.0.5) + test-unit (3.3.2) power_assert text (1.3.1) totoridipjp (0.1.0) - twitter-text (1.14.7) + twitter-text (3.0.0) + idn-ruby unf (~> 0.1.0) typed-array (0.1.2) unf (0.1.4) unf_ext - unf_ext (0.0.7.4) + unf_ext (0.0.7.6) watch (0.1.0) webmock (1.24.6) addressable (>= 2.3.6) @@ -82,12 +85,14 @@ PLATFORMS ruby DEPENDENCIES - addressable (~> 2.3) + addressable (>= 2.5.2, < 2.6) delayer (~> 0.0) - delayer-deferred (>= 1.0.4, < 1.1) - gettext (~> 3.0.1) - gtk2 (= 3.1.9) + delayer-deferred (>= 2.0, < 3.0) + diva (>= 0.3.2, < 2.0) + gettext (>= 3.2.9, < 3.3) + gtk2 (= 3.3.2) httpclient + irb (>= 1.0.0, < 1.1) json_pure (~> 1.8) memoist (>= 0.16, < 0.17) mocha (~> 0.14) @@ -100,10 +105,13 @@ DEPENDENCIES ruby-prof test-unit (~> 3.0) totoridipjp - twitter-text (>= 1.14.6) + twitter-text (>= 2.1.0) typed-array (~> 0.1) watch (~> 0.1) webmock (~> 1.17) +RUBY VERSION + ruby 2.5.5p157 + BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile index b7d19db37630..efe602edc4f2 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile +++ b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem 'gtk2', '3.1.9' +gem 'gtk2', '3.3.2' diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile index 1625327f16dc..61424d395f9b 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile +++ b/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile @@ -1,5 +1,6 @@ source 'https://rubygems.org' group :default do - gem 'gettext', '~> 3.0.1' + gem 'gettext', '>= 3.2.9', '< 3.3' + gem 'irb', '>= 1.0.0', '< 1.1' end diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 3cb254122d78..ea190db07a61 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -1,15 +1,29 @@ { stdenv, fetchurl , bundlerEnv, ruby -, alsaUtils, libnotify, which, wrapGAppsHook, gtk2 +, alsaUtils, libnotify, which, wrapGAppsHook, gtk2, atk, gobject-introspection }: +# how to update: +# find latest version at: http://mikutter.hachune.net/download#download +# run these commands: +# +# wget http://mikutter.hachune.net/bin/mikutter.3.8.7.tar.gz +# tar xvf mikutter.3.8.7.tar.gz +# cd mikutter +# find . -not -name Gemfile -exec rm {} \; +# find . -type d -exec rmdir -p --ignore-fail-on-non-empty {} \; +# cd .. +# mv mikutter/* . +# rm mikutter.3.8.7.tar.gz +# rm gemset.nix Gemfile.lock; nix-shell -p bundler bundix --run 'bundle lock && bundix' + stdenv.mkDerivation rec { name = "mikutter-${version}"; - version = "3.5.13"; + version = "3.8.7"; src = fetchurl { url = "https://mikutter.hachune.net/bin/mikutter.${version}.tar.gz"; - sha256 = "2e01cd6cfe0caad663a381e5263f6d8030f0fb7cd8d4f858d320166516c7c320"; + sha256 = "1griypcd1xgyfd9wc3ls32grpw4ig0xxdiygpdinzr3bigfmd7iv"; }; env = bundlerEnv { @@ -19,7 +33,7 @@ stdenv.mkDerivation rec { inherit ruby; }; - buildInputs = [ alsaUtils libnotify which gtk2 ruby ]; + buildInputs = [ alsaUtils libnotify which gtk2 ruby atk gobject-introspection ]; nativeBuildInputs = [ wrapGAppsHook ]; postUnpack = '' @@ -41,6 +55,7 @@ stdenv.mkDerivation rec { --prefix GEM_HOME : "${env}/${env.ruby.gemPath}" --set DISABLE_BUNDLER_SETUP 1 ) + # --prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules" mkdir -p $out/share/mikutter $out/share/applications ln -sv $out/core/skin $out/share/mikutter/skin @@ -54,7 +69,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - broken = true; description = "An extensible Twitter client"; homepage = https://mikutter.hachune.net; platforms = ruby.meta.platforms; diff --git a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix index ef7091689b37..5f3ef945b3d4 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix @@ -1,6 +1,8 @@ { addressable = { dependencies = ["public_suffix"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; @@ -10,33 +12,41 @@ }; atk = { dependencies = ["glib2"]; + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18l99gv6828rn59q8k6blxg146b025fj44klrcisffw6h9s9qqxm"; + sha256 = "17c5ixwyg16lbbjix2prk7fa6lm0vkxvc1z6m6inc6jgkb1x0700"; type = "gem"; }; - version = "3.1.9"; + version = "3.3.2"; }; cairo = { dependencies = ["native-package-installer" "pkg-config"]; + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f0n057cj6cjz7f38pwnflrkbwkl8pm3g9ssa51flyxr7lcpcw7c"; + sha256 = "0yvv2lcbsybzbw1nrmfivmln23da4rndrs3av6ymjh0x3ww5h7p8"; type = "gem"; }; - version = "1.15.10"; + version = "1.16.4"; }; cairo-gobject = { dependencies = ["cairo" "glib2"]; + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qnsd9203qc6hl2i4hfzngr8v06rfk4vxfn6sbr8b4c1q4n0lq26"; + sha256 = "12q441a5vnfvbcnli4fpq2svb75vq1wvs2rlgsp6fv38fh6fgsfz"; type = "gem"; }; - version = "3.1.9"; + version = "3.3.2"; }; crack = { dependencies = ["safe_yaml"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; @@ -45,6 +55,8 @@ version = "0.4.3"; }; delayer = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "156vy4x1d2jgafkjaafzfz7g8ghl4p5zgbl859b8slp4wdxy3v1r"; @@ -54,76 +66,105 @@ }; delayer-deferred = { dependencies = ["delayer"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rp2hpik8gs1kzwwq831jwj1iv5bhfwd3dmm9nvizy3nqpz1gvvb"; + sha256 = "0zvqphyzngj5wghgbb2nd1qj2qvj2plsz9vx8hz24c7bfq55n4xz"; type = "gem"; }; - version = "1.0.4"; + version = "2.0.0"; + }; + diva = { + dependencies = ["addressable"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rp125gdlq7jqq7x8la52pdpimhx5wr66frcgf6z4jm927rjw84d"; + type = "gem"; + }; + version = "0.3.2"; }; gdk_pixbuf2 = { dependencies = ["gio2"]; + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x7vna77qw26479dydzfs1sq7xmq31xfly2pn5fvh35wg0q4y07d"; + sha256 = "071z8a8khs5qb43ri5hbvaijwbx43mick7cjfmhn6javifkzijk7"; type = "gem"; }; - version = "3.1.9"; + version = "3.3.2"; }; gettext = { dependencies = ["locale" "text"]; + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14vw306p46w2kyad3kp9vq56zw3ch6px30wkhl5x0qkx8d3ya3ir"; + sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr"; type = "gem"; }; - version = "3.0.9"; + version = "3.2.9"; }; gio2 = { - dependencies = ["glib2" "gobject-introspection"]; + dependencies = ["gobject-introspection"]; + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dxyaxp32m19mynw20x39vkb50wa4jcxczwmbkq7pcg55j76wwhm"; + sha256 = "1f131yd9zzfsjn8i4k8xkl7xm3c5f9sm7irvwxnqqh635qccfz8n"; type = "gem"; }; - version = "3.1.9"; + version = "3.3.2"; }; glib2 = { dependencies = ["native-package-installer" "pkg-config"]; + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y1ws895345a88wikqil1x87cpd7plmwfi635piam7il6vsb4h73"; + sha256 = "13r1i8gkgxj0fjz7bdnqqrsvszl7dffbf85ghx2f8p7zrcbzlk3p"; type = "gem"; }; - version = "3.1.9"; + version = "3.3.2"; }; gobject-introspection = { dependencies = ["glib2"]; + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04gla6z9y8g0d69wlwl0wr7pwyzqg132pfs1n9fq6fgkjb6l7sm3"; + sha256 = "15njcm0yg4qpwkhyx6gf2nxvjl6fxm9jffan8zrl2xyh68yr4jf7"; type = "gem"; }; - version = "3.1.9"; + version = "3.3.2"; }; gtk2 = { dependencies = ["atk" "gdk_pixbuf2" "pango"]; + groups = ["plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mshgsw2x0w5wfcp17qnsja50aafbjxy2g42kvk5sr19l0chkkkq"; + sha256 = "1a4lj6anmvr82cwrg8swzglz90jss995zr7bvsiwr876qqdwv7qs"; type = "gem"; }; - version = "3.1.9"; + version = "3.3.2"; }; hashdiff = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9"; + sha256 = "1qji49afni3c90zws617x514xi7ik70g2iwngj9skq68mjcq6y4x"; type = "gem"; }; - version = "0.3.7"; + version = "0.3.9"; }; httpclient = { + groups = ["plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; @@ -131,7 +172,19 @@ }; version = "2.8.3"; }; + idn-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07vblcyk3g72sbq12xz7xj28snpxnh3sbcnxy8bglqbfqqhvmawr"; + type = "gem"; + }; + version = "0.1.0"; + }; instance_storage = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "08nf5fhq9dckq9lmaklxydq0hrlfi7phk66gr3bggxg45zd687pl"; @@ -139,7 +192,19 @@ }; version = "1.0.0"; }; + irb = { + groups = ["default" "plugin"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "181d88hns00fpw8szg8hbchflwq69wp3y5zvd3dyqjzbq91v1dcr"; + type = "gem"; + }; + version = "1.0.0"; + }; json_pure = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1vllrpm2hpsy5w1r7000mna2mhd7yfrmd8hi713lk0n9mv27bmam"; @@ -148,6 +213,8 @@ version = "1.8.6"; }; locale = { + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x"; @@ -156,6 +223,8 @@ version = "2.1.2"; }; memoist = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh"; @@ -164,6 +233,8 @@ version = "0.16.0"; }; metaclass = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5"; @@ -172,15 +243,19 @@ version = "0.0.4"; }; mini_portile2 = { + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; mocha = { dependencies = ["metaclass"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0id1x7g46fzy8f4jna20ys329ydaj3sad75qs9db2a6nd7f0zc2b"; @@ -189,81 +264,101 @@ version = "0.14.0"; }; moneta = { + groups = ["plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pgwn6xnlh7vviy511mfgkv2j3sfihn5ic2zabmyrs2nh6kfa912"; + sha256 = "1mbs9w3c13phza8008mwlx8s991fzigml7pncq94i1c2flz9vw95"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.1"; }; native-package-installer = { + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0svj2sg7y7izl90qrvzd2fcb1rkq8bv3bd6lr9sh1ml18v3w882a"; + sha256 = "03qrzhk807f98bdwy6c37acksyb5fnairdz4jpl7y3fifh7k7yfn"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.7"; }; nokogiri = { dependencies = ["mini_portile2"]; + groups = ["plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021"; + sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; type = "gem"; }; - version = "1.8.1"; + version = "1.10.3"; }; oauth = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a5cfg9pm3mxsmlk1slj652vza8nha2lpbpbmf3rrk0lh6zi4d0b"; + sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y"; type = "gem"; }; - version = "0.5.3"; + version = "0.5.4"; }; pango = { - dependencies = ["cairo" "cairo-gobject" "gobject-introspection"]; + dependencies = ["cairo-gobject" "gobject-introspection"]; + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0swld0s01djjlqrari0ib75703mb7qr4ydn00cqfhdr7xim66hjk"; + sha256 = "0lbhjsd6y42iw572xcynd6gcapczjki41h932s90rkh6022pbm9p"; type = "gem"; }; - version = "3.1.9"; + version = "3.3.2"; }; pkg-config = { + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "056qb6cwbw2l9riq376wazx4kwd67cdilyclpa6j38mfsswpmzws"; + sha256 = "1s56ym0chq3fycl29vqabcalqdcf7y2f25pmihjwqgbmrmzdyvr1"; type = "gem"; }; - version = "1.2.8"; + version = "1.3.7"; }; pluggaloid = { dependencies = ["delayer" "instance_storage"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p9s1bzw02jzjlpjpxsbfsy1cyfbqs10iqvhxqh4xgyh72nry9zr"; + sha256 = "0fkm6y7aq132icmmv4k8mqw08fxqil8k52l8li642jyi79hvzrqh"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.2"; }; power_assert = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h0s1clasynlbk3782801c61yx24pdv959fpw53g5yl8gxqj34iz"; + sha256 = "072y5ixw59ad47hkfj6nl2i4zcyad8snfxfsyyrgjkiqnvqwvbvq"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.4"; }; public_suffix = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f"; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.3"; }; rake = { + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b"; @@ -272,6 +367,8 @@ version = "10.5.0"; }; ruby-hmac = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "01zym41f8fqbmxfz8zv19627swi62ka3gp33bfbkc87v5k7mw954"; @@ -280,31 +377,39 @@ version = "0.4.0"; }; ruby-prof = { + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y13gdcdajfgrkx5rc9pvb7bwkyximwl5yrhq05gkmhflzdr7kag"; + sha256 = "02z4lh1iv1d8751a1l6r4hfc9mp61gf80g4qc4l6gbync3j3hf2c"; type = "gem"; }; - version = "0.16.2"; + version = "0.17.0"; }; safe_yaml = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; test-unit = { dependencies = ["power_assert"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gl5b2d6bysnm0a1zx54qn6iwd67f6gsjy0c7zb68ag0453rqcnv"; + sha256 = "0hf47w70ajvwdchx0psq3dir26hh902x9sz0iwbxqj8z9w1kc6sd"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.2"; }; text = { + groups = ["default" "plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg"; @@ -313,6 +418,8 @@ version = "1.3.1"; }; totoridipjp = { + groups = ["plugin"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "03ci9hbwc6xf4x0lkm6px4jgbmi37n8plsjhbf2ir5vka9f29lck"; @@ -321,15 +428,19 @@ version = "0.1.0"; }; twitter-text = { - dependencies = ["unf"]; + dependencies = ["idn-ruby" "unf"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg"; + sha256 = "1ibk4bl9hrq0phlg7zplkilsqgniji6yvid1a7k09rs0ai422jax"; type = "gem"; }; - version = "1.14.7"; + version = "3.0.0"; }; typed-array = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qlv2rnkin9rwkgjx3k5qvc17m0m7jf5cdirw3wxbjnw5kga27w9"; @@ -339,6 +450,8 @@ }; unf = { dependencies = ["unf_ext"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; @@ -347,14 +460,18 @@ version = "0.1.4"; }; unf_ext = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb"; + sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf"; type = "gem"; }; - version = "0.0.7.4"; + version = "0.0.7.6"; }; watch = { + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "02g4g6ynnldyjjzrh19r584gj4z6ksff7h0ajz5jdwhpp5y7cghx"; @@ -364,6 +481,8 @@ }; webmock = { dependencies = ["addressable" "crack" "hashdiff"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "03vlr6axajz6c7xmlk0w1kvkxc92f8y2zp27wq1z6yk916ry25n5"; diff --git a/pkgs/applications/networking/instant-messengers/mikutter/shell.nix b/pkgs/applications/networking/instant-messengers/mikutter/shell.nix deleted file mode 100644 index bc83767af32a..000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/shell.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs ? import {} }: - -pkgs.stdenv.mkDerivation { - name = "mikutter-shell"; - buildInputs = with pkgs; [ - bundix - bundler - ]; - - shellHook = '' - export MIKUTTER_CONFROOT="/homeless-shelter" - truncate --size 0 Gemfile.lock - bundle lock - bundle package --path=vendor/bundle --no-install - rm -rf vendor .bundle - bundix -d - ''; -} diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 4e2de5c9caf2..f9f1addd4c31 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -23,7 +23,7 @@ , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx -, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf +, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , libselinux ? null, libsepol ? null }@args: @@ -179,9 +179,17 @@ in gtk2 = attrs: { nativeBuildInputs = [ pkgconfig ] ++ lib.optionals stdenv.isLinux [ utillinux libselinux libsepol ]; - buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp]; + buildInputs = [ + fribidi + gobject-introspection + gtk2 + harfbuzz + pcre + xorg.libpthreadstubs + xorg.libXdmcp + ]; # CFLAGS must be set for this gem to detect gdkkeysyms.h correctly - CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; + # CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path"; }; gobject-introspection = attrs: { @@ -299,7 +307,15 @@ in pango = attrs: { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 xorg.libXdmcp pcre xorg.libpthreadstubs ]; + buildInputs = [ + fribidi + gobject-introspection + gtk2 + harfbuzz + pcre + xorg.libpthreadstubs + xorg.libXdmcp + ]; }; patron = attrs: { -- cgit 1.4.1 From d29c13b4de97d7cd19044ab353cd53a78102d9f7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 May 2019 22:16:27 -0700 Subject: python37Packages.google-auth-oauthlib: 0.2.0 -> 0.3.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-google-auth-oauthlib/versions --- pkgs/development/python-modules/google-auth-oauthlib/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index c5e9b1028288..b318016ee815 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "226d1d0960f86ba5d9efd426a70b291eaba96f47d071657e0254ea969025728a"; + sha256 = "03rq2rjac0zh16vsw0q914sp62l9f8fp033wn3191pqd2cchqix0"; }; checkInputs = [ @@ -28,6 +28,7 @@ buildPythonPackage rec { ]; checkPhase = '' + rm -fr tests/__pycache__/ py.test ''; -- cgit 1.4.1 From 4f4d3f3d62a537c55054455f5df4e596c3f513b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Apr 2019 18:15:24 -0700 Subject: python37Packages.identify: 1.2.2 -> 1.4.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/python3.7-identify/versions --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index d47f5ce39fec..2db6ad1c3d03 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.2.2"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "d3ddec4436e043c3398392b4ba8936b4ab52fa262284e767eb6c351d9b3ab5b7"; + sha256 = "443f419ca6160773cbaf22dbb302b1e436a386f23129dbb5482b68a147c2eca9"; }; # Tests not included in PyPI tarball -- cgit 1.4.1 From 15ccf1fe4adad60596c87725b40682725dc43085 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Fri, 3 May 2019 13:48:59 +0200 Subject: python.pkgs.jsbeautifier: 1.9.1 -> 1.10.0 --- pkgs/development/python-modules/jsbeautifier/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index 2ca26ad65e8c..226f1743a2a0 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,25 +2,16 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.9.1"; + version = "1.10.0"; propagatedBuildInputs = [ six EditorConfig ]; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "0q8ld072dkccssagjxyvc9633fb6ynflvz70924phgp3zxmim960"; + sha256 = "1e389572ade865173605471e98df4002f4b6e5235121c13f1e4497a3eac69108"; }; - patches = [ - (fetchpatch { - url = "https://github.com/beautify-web/js-beautify/commit/78e35a11cbb805fc044241d6465800ee2bd57ebc.patch"; - sha256 = "1ah7nshk96yljy37i20v4fga834dix9cdbhkdc3flfm4904n4523"; - }) - ]; - - patchFlags = [ "-p2" ]; - meta = with lib; { homepage = "http://jsbeautifier.org"; description = "JavaScript unobfuscator and beautifier."; -- cgit 1.4.1