diff options
37 files changed, 269 insertions, 158 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 4ea45888e5f..a3e0f3e0d12 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -546,7 +546,7 @@ in [ nix pkgs.nix-info ] - ++ optional (config.programs.bash.enableCompletion && !versionAtLeast nixVersion "2.4pre") pkgs.nix-bash-completions; + ++ optional (config.programs.bash.enableCompletion) pkgs.nix-bash-completions; environment.etc."nix/nix.conf".source = nixConf; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 9ca6fa912fe..c78f9fb8ddd 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-15"; + version = "7.1.0-16"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-M5BhCb5caknohwk0oncJBCBJs32p0EdNs4dNqRfDRYc="; + sha256 = "sha256-souH5Fop4ss1ysaYylHcykoeB0HvMtqU51xggKoRFDM="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index 9af8b0aff77..a396e9acc0c 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "pidgin-opensteamworks"; - version = "1.7"; + version = "1.7.2"; src = fetchFromGitHub { owner = "EionRobb"; repo = "pidgin-opensteamworks"; rev = version; - sha256 = "0zxd45g9ycw5kmm4i0800jnqg1ms2gbqcld6gkyv6n3ac1wxizpj"; + sha256 = "sha256-VWsoyFG+Ro+Y6ngSTMQ7yBYf6awCMNOc6U0WqNeg/jU="; }; sourceRoot = "source/steam-mobile"; diff --git a/pkgs/applications/office/clockify/default.nix b/pkgs/applications/office/clockify/default.nix new file mode 100644 index 00000000000..37afa6cc226 --- /dev/null +++ b/pkgs/applications/office/clockify/default.nix @@ -0,0 +1,47 @@ +{ stdenv, lib, fetchurl, dpkg, makeWrapper, electron }: + +stdenv.mkDerivation rec { + pname = "clockify"; + version = "2.0.3"; + + src = fetchurl { + url = "https://web.archive.org/web/20211118160803/https://clockify-resources.s3.eu-central-1.amazonaws.com/downloads/Clockify_Setup.deb"; + sha256 = "sha256-eVZ3OqM1eoWfST7Qu9o8VmLm8ntD+ETf/0aes6RY4Y8="; + }; + + nativeBuildInputs = [ + dpkg + makeWrapper + ]; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + dpkg-deb -x ${src} ./ + ''; + + installPhase = '' + runHook preInstall + + mv usr $out + mv opt $out + + substituteInPlace $out/share/applications/clockify.desktop \ + --replace "/opt/Clockify" $out/bin + + makeWrapper ${electron}/bin/electron $out/bin/clockify \ + --add-flags $out/opt/Clockify/resources/app.asar + + runHook postInstall + ''; + + meta = with lib; { + description = "Free time tracker and timesheet app that lets you track work hours across projects"; + homepage = "https://clockify.me"; + license = licenses.unfree; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + + }; +} diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix index 939acc96ce5..f7f5f64bfd7 100644 --- a/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/pkgs/data/misc/spdx-license-list-data/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.14"; + version = "3.15"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - sha256 = "07fl31732bvcmm93fqrpa7pfq5ynxc1fpd8n9w2iah39lyz49sjm"; + sha256 = "0r88j00shmhayfq8avswaxsaj1my1vq540rg0srma29862vrjpfk"; }; installPhase = '' diff --git a/pkgs/data/themes/sweet/default.nix b/pkgs/data/themes/sweet/default.nix index bd1df3277c9..3ffa3caf8ba 100644 --- a/pkgs/data/themes/sweet/default.nix +++ b/pkgs/data/themes/sweet/default.nix @@ -1,32 +1,34 @@ -{ lib, stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchurl, unzip, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "sweet"; - version = "2.0"; + version = "3.0"; srcs = [ (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-Ambar-Blue.tar.xz"; - sha256 = "028pk07im7pab8a2vh3bvjm8jg37dpvn4c1mwn6vhb6wcr9v5c75"; + url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Ambar-Blue.zip"; + sha256 = "sha256-6ZrjH5L7Yox7riR+2I7vVbFoG4k7xHGyOq1OnkllyiY"; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-Ambar.tar.xz"; - sha256 = "0zmdmqndj65kr43g3z57blrmv0y856zlfprm6y45zbf4xz3ybkg6"; + url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Ambar.zip"; + sha256 = "sha256-FAbf682YJCCt8NKSdFoaFLwxLDU1aCcTgNdlybZtPMo="; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-Dark.tar.xz"; - sha256 = "02sw664fkrfpsygspq8fn4zgk8rxs9rd29nnx6nyvkji68mb51s6"; + url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Dark.zip"; + sha256 = "sha256-t6fczOnKwi4B9hSFhHQaQ533o7MFL+7HPtUJ/p2CIXM="; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-mars.tar.xz"; - sha256 = "14rl3il61jyqwiqlpgbh397q3rcs7jcf2pvr2763ar5a9czmy8h6"; + url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-mars.zip"; + sha256 = "sha256-QGkkpUqkxGPM1DXrvToB3taajk7vK3rqibQF2M4N9i0="; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet.tar.xz"; - sha256 = "0rza3yxwj256ibqimymjhd6lpjzr7fkhggq0ijdg1wab3q91x66q"; + url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet.zip"; + sha256 = "sha256-1qVC2n7ypN1BFuSzBpbY7QzJUzF1anYNAVcMkNpGTMM"; }) ]; + nativeBuildInputs = [ unzip ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; sourceRoot = "."; diff --git a/pkgs/development/compilers/factor-lang/factor98.nix b/pkgs/development/compilers/factor-lang/factor98.nix index c4a9a075fdf..f9b59339825 100644 --- a/pkgs/development/compilers/factor-lang/factor98.nix +++ b/pkgs/development/compilers/factor-lang/factor98.nix @@ -1,53 +1,53 @@ -{ stdenv -, lib -, git +{ lib +, stdenv +, cairo , curl -, makeWrapper -, runtimeShell , fetchurl -, unzip -, runCommand -, writeScriptBin -, interpreter -, glib -, pango -, cairo -, gtk2-x11 +, freealut , gdk-pixbuf +, git +, glib , gnome2 -, pcre +, graphviz +, gtk2-x11 +, interpreter , libGL , libGLU -, freealut -, openssl -, udis86 -, openal , libogg -, libvorbis -, graphviz , librsvg -, zlib -, tzdata +, libvorbis +, makeWrapper , ncurses +, openal +, openssl +, pango +, pcre +, runCommand +, runtimeShell +, tzdata +, udis86 +, unzip +, writeScriptBin +, zlib }: let runtimeLibs = [ - glib - pango cairo - gtk2-x11 + freealut gdk-pixbuf + glib gnome2.gtkglext - pcre + graphviz + gtk2-x11 libGL libGLU - freealut - openssl - udis86 - openal libogg libvorbis - graphviz + openal + openssl + pango + pcre + udis86 zlib ]; @@ -154,9 +154,9 @@ stdenv.mkDerivation { runHook postBuild ''; - # For now, the check phase runs, but should always return 0. This way the - # logs contain the test failures until all unit tests are fixed. Then, it - # should return 1 if any test failures have occured. + # For now, the check phase runs, but should always return 0. This way the logs + # contain the test failures until all unit tests are fixed. Then, it should + # return 1 if any test failures have occured. doCheck = false; checkPhase = '' runHook preCheck @@ -196,9 +196,22 @@ stdenv.mkDerivation { }; meta = with lib; { - homepage = http://factorcode.org; - license = licenses.bsd2; + homepage = "https://factorcode.org/"; description = "A concatenative, stack-based programming language"; + longDescription = '' + The Factor programming language is a concatenative, stack-based + programming language with high-level features including dynamic types, + extensible syntax, macros, and garbage collection. On a practical side, + Factor has a full-featured library, supports many different platforms, and + has been extensively documented. + + The implementation is fully compiled for performance, while still + supporting interactive development. Factor applications are portable + between all common platforms. Factor can deploy stand-alone applications + on all platforms. Full source code for the Factor project is available + under a BSD license. + ''; + license = licenses.bsd2; maintainers = with maintainers; [ vrthra spacefrogg ]; platforms = lib.intersectLists platforms.x86_64 platforms.linux; }; diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 3aa90733a92..ec52e56c1fa 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -71,7 +71,8 @@ stdenv.mkDerivation (args // { # See #144785 for details. configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08" && !(stdenv.isDarwin && stdenv.isAarch64)) [ "host" "target" ]; # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together - hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie"; + hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie" + ++ lib.optionals (args ? hardeningDisable) args.hardeningDisable; buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; buildInputs = optional (!lib.versionAtLeast version "4.07") ncurses diff --git a/pkgs/development/libraries/java/jdom/builder.sh b/pkgs/development/libraries/java/jdom/builder.sh deleted file mode 100755 index dbec4b6f3e0..00000000000 --- a/pkgs/development/libraries/java/jdom/builder.sh +++ /dev/null @@ -1,6 +0,0 @@ -set -e -source $stdenv/setup - -tar zxvf $src -mkdir -p $out -mv * $out diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix index 4bb90dd9887..cbbec60ad32 100644 --- a/pkgs/development/libraries/java/jdom/default.nix +++ b/pkgs/development/libraries/java/jdom/default.nix @@ -1,14 +1,18 @@ -{lib, stdenv, fetchurl} : +{ lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "jdom-1.0"; - builder = ./builder.sh; +stdenv.mkDerivation rec { + pname = "jdom"; + version = "1.0"; src = fetchurl { - url = "http://www.jdom.org/dist/binary/jdom-1.0.tar.gz"; + url = "http://www.jdom.org/dist/binary/jdom-${version}.tar.gz"; sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf"; }; + buildCommand = '' + cp -r ./ $out + ''; + meta = with lib; { description = "Java-based solution for accessing, manipulating, and outputting XML data from Java code"; homepage = "http://www.jdom.org"; diff --git a/pkgs/development/libraries/java/lucene/builder.sh b/pkgs/development/libraries/java/lucene/builder.sh deleted file mode 100755 index d95feb5eeb4..00000000000 --- a/pkgs/development/libraries/java/lucene/builder.sh +++ /dev/null @@ -1,6 +0,0 @@ -set -e -source $stdenv/setup - -tar zxvf $src -mkdir -p $out -mv $name/* $out diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix index 417c7b96900..9791c0ee455 100644 --- a/pkgs/development/libraries/java/lucene/default.nix +++ b/pkgs/development/libraries/java/lucene/default.nix @@ -1,16 +1,18 @@ -{lib, stdenv, fetchurl} : +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "lucene"; version = "1.4.3"; - builder = ./builder.sh; - src = fetchurl { - url = "https://archive.apache.org/dist/jakarta/lucene/${pname}-${version}.tar.gz"; + url = "https://archive.apache.org/dist/jakarta/lucene/lucene-${version}.tar.gz"; sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh"; }; + buildCommand = '' + cp -r . $out/ + ''; + meta = with lib; { description = "Java full-text search engine"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/wlroots/protocols.nix b/pkgs/development/libraries/wlroots/protocols.nix new file mode 100644 index 00000000000..0ec15840558 --- /dev/null +++ b/pkgs/development/libraries/wlroots/protocols.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, fetchFromGitLab, wayland-scanner }: + +stdenv.mkDerivation rec { + pname = "wlr-protocols"; + version = "unstable-2021-11-01"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "wlroots"; + repo = "wlr-protocols"; + rev = "d998ee6fc64ea7e066014023653d1271b7702c09"; + sha256 = "1vw8b10d1pwsj6f4sr3imvwsy55d3435sp068sj4hdszkxc6axsr"; + }; + + checkInputs = [ wayland-scanner ]; + + patchPhase = '' + substituteInPlace wlr-protocols.pc.in \ + --replace '=''${pc_sysrootdir}' "=" \ + --replace '=@prefix@' "=$out" + + substituteInPlace Makefile \ + --replace 'wlr-output-power-management-v1.xml' 'wlr-output-power-management-unstable-v1.xml' + ''; + + doCheck = true; + checkPhase = '' + make check + ''; + + installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + + meta = with lib; { + description = "Wayland roots protocol extensions"; + longDescription = '' + wlr-protocols contains Wayland protocols that add functionality not + available in the Wayland core protocol, and specific to wlroots-based + compositors. Such protocols either add completely new functionality, or + extend the functionality of some other protocol either in Wayland core, + or some other protocol in wayland-protocols. + ''; + homepage = "https://gitlab.freedesktop.org/wlroots/wlr-protocols"; + license = licenses.mit; # See file headers + platforms = platforms.linux; + maintainers = with maintainers; [ twitchyliquid64 ]; + }; +} diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 9738d16353d..7b8583b6db3 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -392,6 +392,7 @@ let }; teck-programmer = super.teck-programmer.override { + nativeBuildInputs = [ self.node-gyp-build ]; buildInputs = [ pkgs.libusb1 ]; }; diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix index e169b886f88..2e8fd124fa2 100644 --- a/pkgs/development/python-modules/aiocoap/default.nix +++ b/pkgs/development/python-modules/aiocoap/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "aiocoap"; - version = "0.4.1"; + version = "0.4.3"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "chrysn"; repo = pname; rev = version; - sha256 = "0k7ii2l3n139f8712ja6w3z73xiwlfsjgdc4k5c514ni2w6w2yjc"; + sha256 = "sha256-fTRDx9VEXDoMKM78YYL+mBEdvhbLtHiHdo66kwRnNhA="; }; propagatedBuildInputs = [ @@ -38,7 +40,9 @@ buildPythonPackage rec { "test_uri_parser" ]; - pythonImportsCheck = [ "aiocoap" ]; + pythonImportsCheck = [ + "aiocoap" + ]; meta = with lib; { description = "Python CoAP library"; diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index 20c068080c9..0ae7c3e8a06 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , aiohttp , pytestCheckHook @@ -10,13 +10,16 @@ buildPythonPackage rec { pname = "aiojobs"; - version = "0.3.0"; + version = "1.0.0"; format = "flit"; - disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-9mMdQtxDCPfYg6u9cNTpdvP8w1o7oejq5dSvSUCh4MM="; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = pname; + rev = "v${version}"; + sha256 = "EQwD0b2B9qFVd/8thKInaio0hpPzvVIjvCN0TcARu2w="; }; nativeBuildInputs = [ @@ -32,11 +35,13 @@ buildPythonPackage rec { pytest-aiohttp ]; - pythonImportsCheck = [ "aiojobs" ]; + pythonImportsCheck = [ + "aiojobs" + ]; meta = with lib; { - homepage = "https://github.com/aio-libs/aiojobs"; description = "Jobs scheduler for managing background task (asyncio)"; + homepage = "https://github.com/aio-libs/aiojobs"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai ]; }; diff --git a/pkgs/development/python-modules/aiopvapi/default.nix b/pkgs/development/python-modules/aiopvapi/default.nix index b8614d0c97d..55651082891 100644 --- a/pkgs/development/python-modules/aiopvapi/default.nix +++ b/pkgs/development/python-modules/aiopvapi/default.nix @@ -28,7 +28,16 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aiopvapi" ]; + postPatch = '' + # async_timeout 4.0.0 removes loop, https://github.com/sander76/aio-powerview-api/pull/13 + # Patch doesn't apply due to different line endings + substituteInPlace aiopvapi/helpers/aiorequest.py \ + --replace ", loop=self.loop)" ")" + ''; + + pythonImportsCheck = [ + "aiopvapi" + ]; meta = with lib; { description = "Python API for the PowerView API"; diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index d8c1419b0c5..4ca5df17109 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.40.0"; + version = "1.42.0"; src = fetchFromGitHub { owner = "aws"; repo = "serverless-application-model"; rev = "v${version}"; - sha256 = "sha256-jVJVoS7rc1RebBvihzmv6LvufMf/VvXOwj0TYkXBdmo="; + sha256 = "sha256-pjcRsmxPL4lbgDopW+wKQRkRcqebLPTd95JTL8PiWtc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/crownstone-sse/default.nix b/pkgs/development/python-modules/crownstone-sse/default.nix index ff101713cfe..b6fedee081a 100644 --- a/pkgs/development/python-modules/crownstone-sse/default.nix +++ b/pkgs/development/python-modules/crownstone-sse/default.nix @@ -27,6 +27,11 @@ buildPythonPackage rec { certifi ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "aiohttp~=3.7.4" "aiohttp>=3.7.4" + ''; + # Tests are only providing coverage doCheck = false; diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 60a946291ad..b8789290607 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -15,15 +15,16 @@ , lib , glibcLocales , setuptools +, urllib3 }: buildPythonPackage rec { pname = "internetarchive"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "72094f05df39bb1463f61f928f3a7fa0dd236cab185cb8b7e8eb6c85e09acdc4"; + sha256 = "ebd11ecd038c71e75a3aef8d87750b46480169ecaefb23074c4ae48440bf2836"; }; propagatedBuildInputs = [ @@ -36,6 +37,7 @@ buildPythonPackage rec { args schema setuptools + urllib3 ] ++ lib.optionals (!isPy3k) [ backports_csv ]; checkInputs = [ pytest responses glibcLocales ]; diff --git a/pkgs/development/python-modules/keyring/2.nix b/pkgs/development/python-modules/keyring/2.nix deleted file mode 100644 index 553b649b638..00000000000 --- a/pkgs/development/python-modules/keyring/2.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi -, dbus-python, setuptools-scm, entrypoints, secretstorage -, pytest, pytest-flake8 }: - -buildPythonPackage rec { - pname = "keyring"; - version = "18.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "0f58jq58jhfzlhix7x2zz7c4ycdvcs1z3sgs4lkr4xxx680wrmk7"; - }; - - nativeBuildInputs = [ setuptools-scm ]; - - checkInputs = [ pytest pytest-flake8 ]; - - propagatedBuildInputs = [ dbus-python entrypoints ] ++ lib.optional stdenv.isLinux secretstorage; - - doCheck = !stdenv.isDarwin; - - checkPhase = '' - py.test - ''; - - meta = with lib; { - description = "Store and access your passwords safely"; - homepage = "https://pypi.python.org/pypi/keyring"; - license = licenses.psfl; - maintainers = with maintainers; [ lovek323 orivej ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/python-modules/pypoolstation/default.nix b/pkgs/development/python-modules/pypoolstation/default.nix index b49599cfda1..f1fc1e94e51 100644 --- a/pkgs/development/python-modules/pypoolstation/default.nix +++ b/pkgs/development/python-modules/pypoolstation/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pypoolstation"; - version = "0.4.0"; + version = "0.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyPoolstation"; inherit version; - sha256 = "0qacrjv3qybgx052i8jqs4il3k2g0cdhjcn2lqapv87iqyp287k0"; + sha256 = "sha256-GsEYlaoitHS2cOBHtgwhlREcps4q2ObnWywvCSak0NY="; }; nativeBuildInputs = [ @@ -30,7 +30,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "pypoolstation" ]; + pythonImportsCheck = [ + "pypoolstation" + ]; meta = with lib; { description = "Python library to interact the the Poolstation platform"; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index fe8b73224bd..636b5fcd427 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -56,13 +56,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.603"; + version = "2.0.605"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-EJ0i3HOCurjCQEdZBzELBCcIS7sT71vEBjjdNpCmt00="; + sha256 = "sha256-3FSxk2T7JTDn73S+Wf1fJm3Qx4diP1Wf0hJAglBqlxM="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 7b050040029..8f8f37a4e41 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -5,11 +5,11 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.35.0"; + version = "1.36.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-ojJoC8UuZDVm6CDmYbPoO0e+1QAYa0UcekYEd/MGFRM="; + sha256 = "sha256-GJbBhe1l25ZHGWVu1o2oJvd/BNv8dv7aIYor/ebFl9U="; }; # Tests are not included in the PyPI package diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index c639f31ae64..a922ae751e2 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "15.6.2"; + version = "15.7"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - sha256 = "sha256-nWouBe1qptDHedrSw5KDuGYyT7Bvf3cfwMynAfQALVY="; + sha256 = "sha256-SrD2rwV/8RnE5HvYSN51fsjZ3lAJwmDiyr/ywDK1TT4="; }; nativeBuildInputs = [ cmake ninja pkg-config ]; diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index ade022cefe9..4e07148761b 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -5,7 +5,7 @@ }: let - openrct2-version = "0.3.5"; + openrct2-version = "0.3.5.1"; # Those versions MUST match the pinned versions within the CMakeLists.txt # file. The REPLAYS repository from the CMakeLists.txt is not necessary. @@ -16,7 +16,7 @@ let owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${openrct2-version}"; - sha256 = "0xmj0qs49d1xlc8lbspr1vg66i0jdjlhcfxci72x6knjvd0vcgz0"; + sha256 = "01v9nsabqjq8hjmyshcp7f5liagfq8sxx9i3yqqab7zk4iixag1h"; }; objects-src = fetchFromGitHub { @@ -74,7 +74,7 @@ stdenv.mkDerivation { ''; preConfigure = '' - # Verify that the correct version of the third party repositories is used. + # Verify that the correct version of each third party repository is used. grep -q '^set(OBJECTS_VERSION "${objects-version}")$' CMakeLists.txt \ || (echo "OBJECTS_VERSION differs!"; exit 1) @@ -87,6 +87,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Open source re-implementation of RollerCoaster Tycoon 2 (original game required)"; homepage = "https://openrct2.io/"; + downloadPage = "https://github.com/OpenRCT2/OpenRCT2/releases"; license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ oxzi ]; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index df50f068cf2..167e881901b 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "6.0.1"; + version = "6.0.2"; url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; - sha256 = "sha256-Ogmh7Jyh6h1PcpWY14JxeXP09kRYZn+7dX0SLzoB2ko="; + sha256 = "sha256-3+PFiseFwHIg4o8VtiKZ12wk0lametm//Yrvpns9u3A="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index 25dd61bc8a0..1f27c262e67 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/aircrack-ng/rtl8812au"; license = licenses.gpl2Only; maintainers = [ maintainers.jethro ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix index 56e04b34084..23b8ffd1f3e 100644 --- a/pkgs/servers/libreddit/default.nix +++ b/pkgs/servers/libreddit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.16.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "spikecodes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E8PoUoHsrTKgLBs3b/C2x/nRrL99eiVNscRtDfKIWNc="; + sha256 = "sha256-d6MDyFwQGvPQ1o+oYzZWhG2vFhBrFwMoV7a9vqFj+gs="; }; - cargoSha256 = "sha256-tK0wvmn+U4pdDdBhmXJ2TmFRro85kfFkYVkxBXftbdE="; + cargoSha256 = "sha256-Dpfs4kC8wijmEd2HejT/RfWAbfxqO701uFcUtBGmCjo="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix index 2034eed1f5d..2e8b49385fb 100644 --- a/pkgs/shells/bash/nix-bash-completions/default.nix +++ b/pkgs/shells/bash/nix-bash-completions/default.nix @@ -32,5 +32,7 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ hedning ]; + # Set a lower priority such that the newly provided completion from Nix 2.4 are preferred. + priority = 10; }; } diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index ffc93bff6b7..4f4ad91e828 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.39.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-eN1tTKNuZMU3qObHaqq70bdkmZeAD6LNAQau9JGSXpE="; + sha256 = "sha256-ebIU632dYCKaU1Hh8Q3k6W2SRdZ49kcVx6eTzcKAzQw="; }; - cargoSha256 = "sha256-6TZz8b8fALPTDRxzp+7ZWCHjOwVtqRjdSO6aEwZcMnc="; + cargoSha256 = "sha256-/AIARaMAxxMgBMMVecp2BXTyCe99pf/eXGJB6O1MyuU="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 8c9e1bcdf0f..57b2f8be52c 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.4.2"; + version = "9.5.0"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aB3jYQKyqfaQBcCbFbN8ZIfosyLy+bX6SJF+iiT2ELQ="; + sha256 = "sha256-BgUurfzgezbbH0pCTuRINocc5y6ANCM91VlWht86QeE="; }; - vendorSha256 = "sha256-bsggZ6e9a7tq0jgOpqIRgfj4FUu/krLWuLBZjaialO0="; + vendorSha256 = "sha256-MstlmaMEbbAY9+h5pNVCXqDOqoSv5hjuRSFS/MTg6lo="; doCheck = false; diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 480321ad15f..3cb5ecb0153 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { pname = "linkchecker"; - version = "10.0.0"; + version = "10.0.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v" + version; - sha256 = "sha256-gcaamRxGn124LZ8rU+WzjRookU3akDO0ZyzI7/S6kFA="; + sha256 = "sha256-OOssHbX9nTCURpMKIy+95ZTvahuUAabLUhPnRp3xpN4="; }; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45952704569..790cd18fa74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2573,6 +2573,10 @@ with pkgs; clipster = callPackage ../tools/misc/clipster { }; + clockify = callPackage ../applications/office/clockify { + electron = electron_11; + }; + contrast = callPackage ../applications/accessibility/contrast { }; cplex = callPackage ../applications/science/math/cplex (config.cplex or {}); @@ -16198,6 +16202,7 @@ with pkgs; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { svt-av1 = if stdenv.isAarch64 then null else svt-av1; rav1e = null; # We already have SVT-AV1 for faster encoding + rtmpdump = null; # Prefer the built-in RTMP implementation # The following need to be fixed on Darwin libjack2 = if stdenv.isDarwin then null else libjack2; libmodplug = if stdenv.isDarwin then null else libmodplug; @@ -20130,6 +20135,8 @@ with pkgs; wiredtiger = callPackage ../development/libraries/wiredtiger { }; + wlr-protocols = callPackage ../development/libraries/wlroots/protocols.nix { }; + wt = wt4; inherit (callPackages ../development/libraries/wt {}) wt3 diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 70b7926d30e..9609c122727 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6887,6 +6887,10 @@ let }; buildInputs = [ CPANMetaCheck TestDeep TestFailWarnings TestFatal TestFileShareDir ]; propagatedBuildInputs = [ AppCmd CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PathTiny PerlPrereqScanner SoftwareLicense TermEncoding TermUI YAMLTiny ]; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/dzil + ''; meta = { homepage = "http://dzil.org/"; description = "Distribution builder; installer not included!"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ccd42a21a62..d863ce5c21b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -96,10 +96,10 @@ mapAliases ({ smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02 sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28 - tensorflow-bin_2 = self.tensorflow-bin; # added 2021-11-25 - tensorflow-build_2 = self.tensorflow-build; # added 2021-11-25 - tensorflow-estimator_2 = self.tensorflow-estimator; # added 2021-11-25 - tensorflow-tensorboard_2 = self.tensorflow-tensorboard; # added 2021-11-25 + tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25 + tensorflow-build_2 = tensorflow-build; # added 2021-11-25 + tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25 + tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25 topydo = throw "topydo was moved to pkgs.topydo"; # added 2017-09-22 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index f9f9dc3bdb6..d96d5a4252f 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -218,8 +218,6 @@ with self; with super; { jupyter_console = callPackage ../development/python-modules/jupyter_console/5.nix { }; - keyring = callPackage ../development/python-modules/keyring/2.nix { }; - koji = callPackage ../development/python-modules/koji { }; konfig = callPackage ../development/python-modules/konfig { }; |