diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 4e30e32774d..86651169246 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -10,13 +10,13 @@ assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.43"; + version = "0.44"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "sha256-/bynLU4/QtUawBjhcaajjuUDUwaSt6zk4/4TZqfQX3c="; + sha256 = "sha256-Qu41TL8KSKC9L25D6Z8bEbJUJQ9QI08grTGZ+0qGdUQ="; }; buildInputs = [ glib ncurses mpd_clientlib boost ] diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 0f47b87d4ac..2ff712851b9 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "3.4.0"; + version = "3.4.1"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "6dd3de1f5ea9f94af92838c0be5ff30fdaa599aa1d737dcb562f9e0b2b2dbdda"; + sha256 = "sha256-f8P4UdqbzXxQU+zQnyGqPrYQO+mKbFj1IBC28iF0lB4="; }; nativeBuildInputs = [ cmake ninja llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index 51c61ca28e7..547e7e0b6da 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -1,23 +1,31 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , dbus, cmake, pkg-config -, glib, udev, polkit, libmodule +, glib, udev, polkit, libusb1, libjpeg, libmodule , pcre, libXdmcp, util-linux, libpthreadstubs , enableDdc ? true, ddcutil , enableDpms ? true, libXext -, enableGamma ? true, libXrandr +, enableGamma ? true, libdrm, libXrandr, wayland , enableScreen ? true }: stdenv.mkDerivation rec { pname = "clightd"; - version = "4.2"; + version = "5.1"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "07z1m1x7nnczd51sg7m2lb6rb2c37c8glsnbrlq44hx176sj9cmj"; + sha256 = "sha256-BEGum0t+FrCTAEQwTsWeYpoIqimTAz+Bv/ZQPQ3fePY="; }; + patches = [ + # Not needed by next version bump + (fetchpatch { + url = "https://github.com/FedeDP/Clightd/commit/a52a2888e3798c572dad359a017cb0d40e7c5fb7.patch"; + sha256 = "sha256-nUzNBia1EvBQxinAfjyKbuldBoHLY1hfMaxgG2lKQWg="; + }) + ]; + # dbus-1.pc has datadir=/etc SYSTEM_BUS_DIR = "${placeholder "out"}/share/dbus-1/system-services"; # systemd.pc has prefix=${systemd.out} @@ -48,19 +56,22 @@ stdenv.mkDerivation rec { glib udev polkit + libusb1 + libjpeg libmodule pcre libXdmcp util-linux libpthreadstubs - ] ++ optional enableDdc ddcutil - ++ optional enableDpms libXext - ++ optional enableGamma libXrandr; + ] ++ optionals enableDdc [ ddcutil ] + ++ optionals enableDpms [ libXext ] + ++ optionals enableGamma [ libXrandr ] + ++ optionals (enableDpms || enableGamma || enableScreen) [ libdrm wayland ]; postInstall = '' mkdir -p $out/bin - ln -svT $out/lib/clightd/clightd $out/bin/clightd + ln -svT $out/libexec/clightd $out/bin/clightd ''; meta = with lib; { diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix index 6ef2e886a19..e502cd6ccf3 100644 --- a/pkgs/applications/misc/clight/default.nix +++ b/pkgs/applications/misc/clight/default.nix @@ -6,24 +6,21 @@ stdenv.mkDerivation rec { pname = "clight"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clight"; rev = version; - sha256 = "1j7va217g1k8lxl3lly13js8myf0shjc6knalq8q6lakc6j1mkxx"; + sha256 = "sha256-NmfnE6ZWgG9erBmrFFIhutnB1t2Ix/6jo+EeXYVtehg="; }; - # bash-completion.pc completionsdir=${bash-completion.out} - COMPLETIONS_DIR = "${placeholder "out"}/share/bash-completions/completions"; # dbus-1.pc has datadir=/etc SESSION_BUS_DIR = "${placeholder "out"}/share/dbus-1/services"; postPatch = '' sed -i "s@/usr@$out@" CMakeLists.txt sed -i "s@/etc@$out\0@" CMakeLists.txt - sed -i "s@pkg_get_variable(COMPLETIONS_DIR.*@set(COMPLETIONS_DIR $COMPLETIONS_DIR)@" CMakeLists.txt sed -i "s@pkg_get_variable(SESSION_BUS_DIR.*@set(SESSION_BUS_DIR $SESSION_BUS_DIR)@" CMakeLists.txt ''; @@ -46,6 +43,12 @@ stdenv.mkDerivation rec { ] ++ optional withGeoclue geoclue2 ++ optional withUpower upower; + cmakeFlags = [ + # bash-completion.pc completionsdir=${bash-completion.out} + "-DBASH_COMPLETIONS_DIR=${placeholder "out"}/share/bash-completions/completions" + "-DZSH_COMPLETIONS_DIR=${placeholder "out"}/share/zsh/site-functions" + ]; + meta = with lib; { description = "A C daemon that turns your webcam into a light sensor"; homepage = "https://github.com/FedeDP/Clight"; diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 29816dea49e..88274b8664d 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/johanmalm/jgmenu"; description = "Small X11 menu intended to be used with openbox and tint2"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/applications/misc/openbox-menu/with-svg.patch b/pkgs/applications/misc/openbox-menu/000-enable-svg.patch similarity index 100% rename from pkgs/applications/misc/openbox-menu/with-svg.patch rename to pkgs/applications/misc/openbox-menu/000-enable-svg.patch diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index 9d2695f97ff..71c7903dfe2 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, menu-cache }: +{ lib +, stdenv +, fetchurl +, pkg-config +, glib +, gtk2 +, menu-cache +}: stdenv.mkDerivation rec { pname = "openbox-menu"; @@ -12,11 +19,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 menu-cache ]; - patches = [ ./with-svg.patch ]; + # Enables SVG support by uncommenting the Makefile + patches = [ ./000-enable-svg.patch ]; - installPhase = "make install prefix=$out"; + installFlags = [ "prefix=${placeholder "out"}" ]; - meta = { + meta = with lib; { homepage = "http://fabrice.thiroux.free.fr/openbox-menu_en.html"; description = "Dynamic XDG menu generator for Openbox"; longDescription = '' @@ -24,8 +32,8 @@ stdenv.mkDerivation rec { dynamic menu listing installed applications. Most of the work is done by the LXDE library menu-cache. ''; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.romildo ]; - platforms = lib.platforms.unix; + license = licenses.gpl3Plus; + maintainers = [ maintainers.romildo ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index 942384f78f7..4452f643474 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, perl }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, perl, Security }: rustPlatform.buildRustPackage rec { pname = "tickrs"; @@ -15,6 +15,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ perl ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + meta = with lib; { description = "Realtime ticker data in your terminal"; homepage = "https://github.com/tarkah/tickrs"; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 03c9445fe24..17c72e8a330 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.4.3"; + name = "homebank-5.5"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "02wd569viwy6ncy0144z9nxr3zmpl4shkqhz7zzwyky4gknxf8lj"; + sha256 = "sha256-3tqmsCxQXNAsDsLdiyuk4MydH0WgHqsNpgqxvCp+bHU="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index f3bd8dab013..e9fad77e8c0 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 6b6cd00f49a..8ee3206d070 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,24 +1,24 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "0qkxqdx3vs53djiibc4ib3qj61fygxvxfcvs7yi08vdhd9qbxhjg"; - iosevka-aile = "053f6b1z0w1089y608k4wmspgljn9lyzyggq168k0110z9vlfjhf"; - iosevka-curly = "04kc7f6gqqxbdkdh1k4z4b28f8pj09npb87fx4zr41wkzkxmavcf"; - iosevka-curly-slab = "1pdm2g3a1nfc8w53r3sdifwypj3diil16jy6sgvgpmk7klf804vf"; - iosevka-etoile = "10vw53cd317qxhvws11zf98756vfn836assw3rbns6zpfrj7a2xg"; - iosevka-slab = "01ynv6b7fqdd98imfr14xcgrhp20yffa3n738iz5qnr75vqpnfdc"; - iosevka-sparkle = "1nw63dd1ccj8cp1x06alfxdvdlw9ibin41llmc0jla0nz7n8vsp3"; - iosevka-ss01 = "0g54rghx6z0a9azckvgh7njq12rsr1zzskgrm3f29rin8fdwvvd9"; - iosevka-ss02 = "0jhl75bwd76vp9hpvqgj7awpvibv4pk5vjab97n53b4bdxdxh1rf"; - iosevka-ss03 = "1ki5q7gafgm2iayjn82wrnwkfb3nbcr2xsrgs2vsw5lm9plawbmd"; - iosevka-ss04 = "03933skk5zqxrkj5m0j90cxrv4fmjfbp7ai5fywmhjzq92xbcr97"; - iosevka-ss05 = "014dglqr17adyj2229vvzhz61jpkgj33ngkav5sh2dj5wcx6b137"; - iosevka-ss06 = "07z87rm0rb9n6d7h0kmp51dnnglmr0wbwmplc5mlv036fcrdibaj"; - iosevka-ss07 = "1672n5ynd5fv8dwnwg8aa50ny74ad9gbx2xlk2ixih7ajv15p19d"; - iosevka-ss08 = "1jqdqg6dzrnq6y0g7ls2ya3dh0j00xj2k41aajvdqw342n08h27k"; - iosevka-ss09 = "1p1v0byb2nh11k362zxjrbvzbbryh2wk76dsd1zwyjrlgqq6qa81"; - iosevka-ss10 = "12c940w8vy1hjhi7cxgqsb23ip60xw1ydzhx5cv4ycxmi5745wqq"; - iosevka-ss11 = "0s6fvh5pw119w872w4rvamiwssryx4a98c7fhr737nzgiqy4iyz5"; - iosevka-ss12 = "14gjqmn807cv3dbvkm2i6dz6if46fbrkr8ls5shwalnl8qj3d06c"; - iosevka-ss13 = "1qd04cani9jzp1hjs8g6b42bmxvjyyxdha122816s0rg9i46mpcc"; - iosevka-ss14 = "0q109ahk7ww66brxgldgmr61m2qzpyhi1q21591wg1br5cn2d52w"; + iosevka = "1ic5w8w4v27vfq7pvx9wv2zdcsj16xi71ln2a3fb4kh93zj84kl8"; + iosevka-aile = "1qv2b4zcz172knvr39argqshjpin1lidlafilfcm569cp8rasrdd"; + iosevka-curly = "0x9pdgyiab8hibyf1yrwn6cr90aqy9ygyk1zz9nqzcndk5mk54p4"; + iosevka-curly-slab = "0mxnbf9dwq3iq5dc0cgrdqf2dlyymylv46psb83n5kra4rz1wxnb"; + iosevka-etoile = "1rz9dkpiwwfjnhiajfxg3rrnf4lyxnynx89qswg0b8wql4q6bz71"; + iosevka-slab = "17p0cf4k8k3kabqp0b1anqqj8phfw7nnxiiscnngbrxhdvhpp62n"; + iosevka-sparkle = "0ip46lcq7gcv77ar6vqz51lhf448fd0nviijfpqfg7gdywdzalm0"; + iosevka-ss01 = "1v1z2rx7r6nb45i3qcb9pvilm6yxxkl5ks7ldmm902cx67pkv7rj"; + iosevka-ss02 = "1pd4sbr1p1cf9917nnn22v1kah8jfgm9jpfvq1j51wyr8lnxqz2k"; + iosevka-ss03 = "0pdbvrzilrxxcaz9gnhnqxvk4ipfxcgys41sasl3znxzij1ary8s"; + iosevka-ss04 = "08xwdp5s3dp30qy81j3qwhhqk1bibcpnh2i00a3kyw3g6jsnsvmp"; + iosevka-ss05 = "1njf1ysd42k2rc2lvg5ilq6q2wvg8dlm04d7wygdamw0yx6sia83"; + iosevka-ss06 = "04g4m770i1b75gl1lanbs0ibmjj8vg5yfwyn6n0bidfn30z4n01l"; + iosevka-ss07 = "07f1n44f5bvifbns6572ys6zihac6yljv7frm58w7xgyl0a3prvg"; + iosevka-ss08 = "157cq5jfxvr0n7ksqln5mjmr800dbyfy8vwl0ngbf0aiq3mw2x8f"; + iosevka-ss09 = "0yib3mhb48g2vjiaviwgcl6lad4dbwwblnmv4zi880bdvz7jrwr9"; + iosevka-ss10 = "06s0s9x1fiqqmnkm42khasws40db7l68d2ycsm38mx6b62nlsbkr"; + iosevka-ss11 = "0yzy322zqas0id70i1p92x7fbim8gai0a61nf6bf33aq3qgsj2w8"; + iosevka-ss12 = "0lhmhwd4z44y4469av6na7k5w4ra47g98dxfi0mb42a4n4sq0k5j"; + iosevka-ss13 = "1cq91iqfgq4fsazi2pjh6l4n9mgci4aayqp7fiy8lydv7f1ym0z9"; + iosevka-ss14 = "0xid48yr2qfsh6kvlajlaqnb43ck351kg8r3bwpvzrdbvl809983"; } diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index c004ee6618b..3e91c55743f 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,14 +1,23 @@ -{ lib, stdenv, fetchurl, glib, intltool, menu-cache, pango, pkg-config, vala +{ lib +, stdenv +, fetchurl +, glib +, intltool +, menu-cache +, pango +, pkg-config +, vala , extraOnly ? false -, withGtk3 ? false, gtk2, gtk3 }: +, withGtk3 ? true , gtk3, gtk2 +}: let gtk = if withGtk3 then gtk3 else gtk2; inherit (lib) optional; in stdenv.mkDerivation rec { - name = if extraOnly - then "libfm-extra-${version}" - else "libfm-${version}"; + pname = if extraOnly + then "libfm-extra" + else "libfm"; version = "1.3.2"; src = fetchurl { @@ -17,16 +26,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ vala pkg-config intltool ]; - buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache; + buildInputs = [ glib gtk pango ] + ++ optional (!extraOnly) menu-cache; - configureFlags = [ - "--sysconfdir=/etc" - ] ++ optional extraOnly "--with-extra-only" - ++ optional withGtk3 "--with-gtk=3"; + configureFlags = [ "--sysconfdir=/etc" ] + ++ optional extraOnly "--with-extra-only" + ++ optional withGtk3 "--with-gtk=3"; - installFlags = [ - "sysconfdir=${placeholder "out"}/etc" - ]; + installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; # libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm postInstall = optional (!extraOnly) '' diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index dea8fcc6759..e4ee3c47307 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.15.4"; + version = "6.15.5"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "06lddr6md4ypmywvi6qrrkw97c8ddz0flj43hzx32ia3iq2mw4w5"; + sha256 = "sha256-o7bi0xcWaH5DXcEJgfY7MxhYfntqhzGoko6EqgrKyY8="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 4f30eefbf90..b5fb2999c96 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aenum"; - version = "2.2.6"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "260225470b49429f5893a195a8b99c73a8d182be42bf90c37c93e7b20e44eaae"; + sha256 = "17cd8cfed1ee4b617198c9fabbabd70ebd8f01e54ac29cd6c3a92df14bd86656"; }; # For Python 3, locale has to be set to en_US.UTF-8 for diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 4836fe35d18..737def7b9ac 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -20,13 +20,13 @@ }: buildPythonPackage rec { - version = "1.7.0"; + version = "1.8.0"; pname = "dask-ml"; disabled = pythonOlder "3.6"; # >= 3.6 src = fetchPypi { inherit pname version; - sha256 = "5f93e8560217ebbc5a2254eaf705e9cad8e1c82012567c658e26464a74fbab76"; + sha256 = "8fc4ac3ec1915e382fb8cae9ff1ec9b5ac1bee0b6f4c6975d6e6cb7191a4a815"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index 979d2811fe6..5ed5a3eb152 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -9,11 +9,11 @@ in buildPythonPackage rec { pname = "dependency-injector"; - version = "4.5.4"; + version = "4.10.3"; src = fetchPypi { inherit pname version; - sha256 = "99e65335cb84d543ebb47e76edadc695d062e5c25cc474698f50ed5e2aaa9002"; + sha256 = "93db83fac85bcb861469c0db1af11f4bc874aa2f9380151189a05d38c21afd60"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index 313ae32f04e..1bc9153d006 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -1,22 +1,30 @@ -{ lib, - fetchPypi, - django, - buildPythonPackage +{ lib +, fetchFromGitHub +, buildPythonPackage +, django +, pytest-django +, pytestCheckHook }: buildPythonPackage rec { pname = "django-cors-headers"; - version = "3.6.0"; + version = "3.7.0"; - src = fetchPypi { - inherit pname version; - sha256 = "5665fc1b1aabf1b678885cf6f8f8bd7da36ef0a978375e767d491b48d3055d8f"; + src = fetchFromGitHub { + owner = "adamchainz"; + repo = "django-cors-headers"; + rev = version; + sha256 = "1wc8cs1gpg9v98bq5qwnd4pcv043za50wd63gwkm86lbvjxyxynz"; }; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ + django + ]; - # pypi release does not include tests - doCheck = false; + checkInputs = [ + pytest-django + pytestCheckHook + ]; meta = with lib; { description = "Django app for handling server Cross-Origin Resource Sharing (CORS) headers"; diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 20d47dfe7e9..0c2d74a90e1 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -1,35 +1,37 @@ { lib , buildPythonPackage -, flake8 -, nose2 -, mock +, fetchFromGitHub , requests , pyjwt -, fetchPypi +, pytestCheckHook +, responses }: buildPythonPackage rec { pname = "globus-sdk"; - version = "1.10.0"; + version = "2.0.1"; - src = fetchPypi { - inherit pname version; - sha256 = "b33021b58edacc16bf2ba8453efbb26a8b04242ee3f4d62dcdaa3c6e199f136f"; + src = fetchFromGitHub { + owner = "globus"; + repo = "globus-sdk-python"; + rev = version; + sha256 = "1kqnr50iwcq9nx40lblbqzf327cdcbkrir6vh70067hk33rq0gm9"; }; - checkPhase = '' - py.test tests - ''; + propagatedBuildInputs = [ + requests + pyjwt + ]; - # No tests in archive - doCheck = false; + checkInputs = [ + pytestCheckHook + responses + ]; - checkInputs = [ flake8 nose2 mock ]; - - propagatedBuildInputs = [ requests pyjwt ]; + pythonImportsCheck = [ "globus_sdk" ]; meta = with lib; { - description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API."; + description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API"; homepage = "https://github.com/globus/globus-sdk-python"; license = licenses.asl20; maintainers = with maintainers; [ ixxie ]; diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index cc6003fa952..e6323c951ee 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "howdoi"; - version = "2.0.8"; + version = "2.0.10"; src = fetchPypi { inherit pname version; - sha256 = "9b7cabab87cd614e26b408653bc8937ec27b79ca2fde6b9457da55d2541f75fb"; + sha256 = "e561e3c5d4f39ab1f86e9f24bb0b2803ee6e312de61e90907f739aa638f35215"; }; postPatch = '' diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index ff7ac9fb3f9..86a505d4448 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2020.12.05"; + version = "2021.01.15"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "c4310ea12d1ac39984a96c40a12fab92aefc3d77a615f89ef542b10497ae56fa"; + sha256 = "5d7109fc779c44070e3c57186eae59b133014835d5fe15b262fa9438d7599c81"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix new file mode 100644 index 00000000000..206e3671f47 --- /dev/null +++ b/pkgs/development/python-modules/pyshark/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchFromGitHub, py, lxml, pytestCheckHook, wireshark-cli }: + +buildPythonPackage rec { + pname = "pyshark"; + version = "0.4.2.11"; + + src = fetchFromGitHub { + owner = "KimiNewt"; + repo = pname; + rev = "v${version}"; + sha256 = "07dkhkf85cplcj1h3k8mmqzsn4zdkxzr0zg3gvf8yc8p5g5azx9q"; + }; + + propagatedBuildInputs = [ + py + lxml + ]; + + preConfigure = '' + cd src + ''; + + preCheck = '' + cd .. + ''; + + checkInputs = [ + pytestCheckHook + wireshark-cli + ]; + + meta = with lib; { + description = "Python wrapper for tshark, allowing python packet parsing using wireshark dissectors"; + homepage = "https://github.com/KimiNewt/pyshark/"; + license = licenses.mit; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index ab7dea9cf53..c6db32a15e4 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pythonOlder , cython +, catalogue , mock , numpy , pathlib @@ -12,17 +13,19 @@ buildPythonPackage rec { pname = "srsly"; - version = "2.3.2"; + version = "2.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f78eaef8d982e98921ce026d4205e652a9333137259f0b621f5c7b579e746e9d"; + sha256 = "e29730be53015970e4a59050e8e9f9be44d762108a617df56c9dfc981b515ab7"; }; nativeBuildInputs = [ cython ]; + propagatedBuildInputs = [ catalogue ]; + checkInputs = [ mock numpy diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 27e043a9ac4..31c5d0d26e8 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "blackfire-agent"; - version = "1.44.2"; + version = "1.46.0"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-agent_${version}_amd64.deb"; - sha256 = "1bam4sb0yhxciykph7wn41zs8fa7c9iwnbihd5kza0cylbb7fbkb"; + sha256 = "0cxgc18xpwyb5wp08km7aj8asn5biqnwq9fkgkk6wv1r1ihqlhf2"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 97b5f9ed82c..780b2a8906f 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -18,11 +18,11 @@ let }.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version."); in stdenv.mkDerivation rec { pname = "php-blackfire"; - version = "1.46.4"; + version = "1.49.1"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb"; - sha256 = "1p46zi1hh9calkcfgqz60c6rdi9i7i16ylj84iibi6k0pc690fjy"; + sha256 = "5Z6CUj/HfSj+pC9iDEmU/OKCYePSAazU9q9M3glnOZU="; }; nativeBuildInputs = [ diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 665122c05bc..dea159f53bf 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "freeciv"; - version = "2.6.2.1"; + version = "2.6.3"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1nra6b6sk2gciaw1fpwx7qa20hky8cwcdwlshcl1zsikg577hyg5"; + sha256 = "sha256-tRjik2LONwKFZOcIuyFDoE1fD23UnZHMdNLo0DdYyOc="; }; postPatch = '' diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix index b89837e5942..870a7836fe4 100644 --- a/pkgs/servers/irc/ngircd/default.nix +++ b/pkgs/servers/irc/ngircd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ngircd"; - version = "26"; + version = "26.1"; src = fetchurl { url = "https://ngircd.barton.de/pub/ngircd/${pname}-${version}.tar.xz"; - sha256 = "1ijmv18fa648y7apxb9vp4j9iq6fxq850kz5v36rysaq614cdp2n"; + sha256 = "sha256-VcFv0mAJ9vxqAH3076yHoC4SL2gGEs2hzibhehjYYlQ="; }; configureFlags = [ diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index c125732cafc..0c422970d56 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -158,7 +158,8 @@ stdenv.mkDerivation rec { description = "The standard Windows interoperability suite of programs for Linux and Unix"; license = licenses.gpl3; platforms = platforms.unix; - broken = stdenv.isDarwin; + # N.B. enableGlusterFS does not build + broken = stdenv.isDarwin || enableGlusterFS; maintainers = with maintainers; [ aneeshusa ]; }; } diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index c8722fbe8f7..44f207e3b86 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wallabag"; - version = "2.4.0"; + version = "2.4.1"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - sha256 = "11vda7aqq82kpr88v4hr7zg19zfq970n3z4qp25my8b1fvlgdjhi"; + sha256 = "1dqf5ia66kjsnfad2xkm8w6jgs976mf9x0dcd73jybqfgs4j09kj"; }; outputs = [ "out" ]; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 0896b8a5046..d633faea1cb 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "1z0p08q4808h78bp6nwdszpfavhr4y7n313bp0gg5qdbssnciq1v"; + sha256 = "sha256-fX1miI8yXzn/T9cbbZ/7E6/tLs3RXsX3PgfC7sBxIjU="; }; postPatch = '' diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 7517e599e73..a4cdcc08549 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl, zlib, util-linux }: let name = "pigz"; - version = "2.4"; + version = "2.6"; in stdenv.mkDerivation { name = name + "-" + version; src = fetchurl { url = "https://www.zlib.net/${name}/${name}-${version}.tar.gz"; - sha256 = "0wsgw5vwl23jrnpsvd8v3xcp5k4waw5mk0164fynjhkv58i1dy54"; + sha256 = "sha256-Lu17DXRJ0dcJA/KmLNYAXSYus6jJ6YaHvIy7WAnbKn0="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 4f519d6858d..e092961a762 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "0.9.9"; + version = "1.0.0"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "1ppiddnrvkbb9iir28kl9hzpww0hpgb05jfxzf07xsqkdfb4qv71"; + sha256 = "sha256-+HxezUWQHyL9r4QZkJyWzWnjquq/ux5W5j2B5prH8Fg="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index d6b0c84b61f..17e67c0bc75 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "0hil3mvrwpwy60x9s16bf8vgvfv11sdarcbk45zjlgjzfhh8h2qr"; + sha256 = "sha256-SdmcyOgK8k07pkjOVWLbNj36ktJnkQWJ8ObPiMgcMYk="; }; dontConfigure = true; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 6a21bc56789..139be092dd5 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "6.0.2"; + version = "6.3.2"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "1pqf7rs9b8j54rwg8i8alvf65c4jfp5q2hv3yr60aiidfjrawp34"; + sha256 = "sha256-yKNHUH+oLQ99oH3yKYQCGAfX3tOI3ghLzLUpPzU6M0k="; }; - cargoSha256 = "1wh7xywp92h3in9a2nr6sia6l3852kw4s688sr1c2wjdf2i58lsg"; + cargoSha256 = "sha256-kSxnEIAKF5Xf/x1LgtEj1u6IchbThtp3Sti5wnezlRA="; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 44c5e42a490..68afd288e23 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -15,14 +15,14 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.28.0"; + version = "1.29.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "1266jbfw55r1zh00xi6c90j2fs9hw8hmsb7686rh04l8mffny9f4"; + sha256 = "sha256-Bkap0Ld5zz+HxEjkZrmPZieUpyim4/gpE8oL0q9LGqk="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0485664fd6..0d77a88ff82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25178,7 +25178,9 @@ in ticpp = callPackage ../development/libraries/ticpp { }; - tickrs = callPackage ../applications/misc/tickrs { }; + tickrs = callPackage ../applications/misc/tickrs { + inherit (darwin.apple_sdk.frameworks) Security; + }; tig = callPackage ../applications/version-management/git-and-tools/tig { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e04b4fea0b..ce862a1b40f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4909,6 +4909,8 @@ in { pysbd = callPackage ../development/python-modules/pysbd { }; + pyshark = callPackage ../development/python-modules/pyshark { }; + python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; python-csxcad = callPackage ../development/python-modules/python-csxcad { };