diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 68eeb85cddd8..ae9f97c139b4 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -544,6 +544,12 @@ 2020 to 2021 + + + the mingw-64 package has been upgraded from + 6.0.0 to 9.0.0 + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 54ea22e3bfc7..172fe9bbcadc 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -138,6 +138,8 @@ pt-services.clipcat.enable). - The `isabelle` package has been upgraded from 2020 to 2021 +- the `mingw-64` package has been upgraded from 6.0.0 to 9.0.0 + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index e0cf5138310a..0ead5ff670c2 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,17 +9,17 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "4.2.1.0"; # "Android Studio 4.2.1" - build = "202.7351085"; - sha256Hash = "074y6i0h8zamjgvvs882im44clds3g6aq8rssl7sq1wx6hrn5q36"; + version = "4.2.2.0"; # "Android Studio 4.2.2" + build = "202.7486908"; + sha256Hash = "18zc9xr2xmphj6m6a1ilwripmvqzplp2583afq1pzzz3cv5h8fvk"; }; betaVersion = { - version = "2020.3.1.16"; # "Android Studio Arctic Fox (2020.3.1) Beta 1" - sha256Hash = "0mp1cmxkqc022nv8cggywbwcf8lp6r802nh8hcw5j00hcdnhkcq0"; + version = "2020.3.1.20"; # "Android Studio Arctic Fox (2020.3.1) Beta 5" + sha256Hash = "0swcsjx29ar4b0c8yhbynshqdn2sv94ga58h2nrc99927vp17g85"; }; latestVersion = { # canary & dev - version = "2021.1.1.1"; # "Android Studio Bumblebee (2021.1.1) Canary 1" - sha256Hash = "0aavmk8byw817356jm28rl998gcp3zm7x3fq14hm2awzhk5jaklm"; + version = "2021.1.1.3"; # "Android Studio Bumblebee (2021.1.1) Canary 3" + sha256Hash = "1n8iahaqhmzvpps9vhv93n3yabb26vl78yndd6gid028r8r90y4x"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index 26c6a8cbc708..e8f329ecb0da 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "formatter"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Djaler"; repo = "Formatter"; rev = version; - sha256 = "0da1dvzsvbwg1ys19yf0n080xc0hjwin9zacjndb24jvphy3bxql"; + sha256 = "sha256-8lZ0jUwHuc3Kntz73Btj6dJvkW2bvShu2KWTSQszbJo="; }; patches = [ diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index f281ab5a4cbb..7367d18ddf8b 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.2.3"; + version = "0.2.6"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "LTwgLG/jUVOSR29LkLJ9q5wpPMK78yFvGtglzMG0ZC0="; + sha256 = "/tpegRGyGPviYpaSbWw7fH9ntvR7vUSD5rmwDMST5+Y="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix new file mode 100644 index 000000000000..4e6518c6ffd2 --- /dev/null +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, pkg-config +, cairo +, gobject-introspection +, gtk3 +, gtk-layer-shell +}: + +buildGoModule rec { + pname = "nwg-drawer"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YjMuXSBAgRh6vZUxKHLTqT2lEU/f+AuI/dX4PHfftZg="; + }; + + vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ cairo gobject-introspection gtk3 gtk-layer-shell ]; + + meta = with lib; { + description = "Application drawer for sway Wayland compositor"; + homepage = "https://github.com/nwg-piotr/nwg-drawer"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ plabadens ]; + }; +} diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index e41bc6bd20de..d669b97c44d1 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "unstable-2021-07-10"; + version = "unstable-2021-07-14"; src = fetchFromGitHub { owner = "getzola"; repo = pname; # unstable because the latest release fails to build - rev = "8c3ce7d7fbc0d585d4cbf27598ac7dfe5acd96f1"; - sha256 = "sha256-Tw3u96ZPb0yUXvtJ+rna6nnb0a+KfTEiR/PPEadFxDA="; + rev = "312ffcb04c06c5f157b9fd2b944b858703238592"; + sha256 = "0i5zqs1gwxhvsynb540c3azfi4357igr4i5p0bi3h7ras2asas8w"; }; - cargoSha256 = "sha256-mOO39LK7lQ5IxwMgfJpNwX/H5MZ3qKqfeDmnY8zXOx4="; + cargoSha256 = "0g5z0s837cfwzral2zz0avp0xywyaa3l1adxg520qrnga7z0kbh8"; nativeBuildInputs = [ cmake pkg-config installShellFiles]; buildInputs = [ openssl oniguruma ] @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { description = "A fast static site generator with everything built-in"; homepage = "https://www.getzola.org/"; license = licenses.mit; - maintainers = with maintainers; [ dywedir _0x4A6F ]; + maintainers = with maintainers; [ dandellion dywedir _0x4A6F ]; # set because of unstable-* version mainProgram = "zola"; }; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 7b2acbd6b3da..7bbbbe082d95 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.26.74"; + version = "1.26.77"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "ULmoUXyPWHCewK4FPP7SX1Ena6n0aM/EWR7ZnMN1ztY="; + sha256 = "tV/VseU+IncvM3gdrmqkYLPClbsf2kSvIAZj0Ylz2Rw="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 8da48f8485f4..89d07da74829 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.24.13"; + version = "0.24.14"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-5gMRjnrk1FyTj3Lzp+6scLuqfP8rCUvDDBK33/RzG28="; + sha256 = "sha256-Kw3TT8IeJT0y2vSd38/y7BRq7PxMH2tiXV4/lOn5INA="; }; buildFlagsArray = '' diff --git a/pkgs/applications/networking/instant-messengers/go-neb/default.nix b/pkgs/applications/networking/instant-messengers/go-neb/default.nix index f1e335133d72..e554f631920b 100644 --- a/pkgs/applications/networking/instant-messengers/go-neb/default.nix +++ b/pkgs/applications/networking/instant-messengers/go-neb/default.nix @@ -2,19 +2,19 @@ buildGoModule { pname = "go-neb"; - version = "unstable-2021-03-24"; + version = "unstable-2021-07-21"; src = fetchFromGitHub { owner = "matrix-org"; repo = "go-neb"; - rev = "b6edd50d6e33de3bcdb35055fa6c5f0157f45321"; - sha256 = "sha256-wFqkN4C0rWzWxa6+/LiHMMS8i/g3Q57f5z4cG2XZQzs="; + rev = "8916c80f8ce1732f64b50f9251242ca189082e76"; + sha256 = "sha256-kuH4vbvS4G1bczxUdY4bd4oL4pIZzuueUxdEp4xuzJM="; }; subPackages = [ "." ]; buildInputs = [ olm ]; - vendorSha256 = "sha256-sWrLWjODf25Z8QqCDg4KyVWmTc3PRiYpRL88yxK0j/M"; + vendorSha256 = "sha256-5Vg7aUkqiFIQuxmsDOJjvXoeA5NjMoBoD0XBhC+o4GA="; doCheck = false; diff --git a/pkgs/applications/science/misc/toil/default.nix b/pkgs/applications/science/misc/toil/default.nix new file mode 100644 index 000000000000..a25fbe7565ce --- /dev/null +++ b/pkgs/applications/science/misc/toil/default.nix @@ -0,0 +1,39 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "toil"; + version = "5.4.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "73c0648828bd3610c07b7648dd06d6ec27efefdb09473bf01d05d91eb899c9fd"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "docker = " "docker = 'docker' #" \ + --replace "addict = " "addict = 'addict' #" + ''; + + propagatedBuildInputs = with python3Packages; [ + addict + docker + pytz + pyyaml + enlighten + psutil + python-dateutil + dill + ]; + checkInputs = with python3Packages; [ pytestCheckHook ]; + + pytestFlagsArray = [ "src/toil/test" ]; + pythonImportsCheck = [ "toil" ]; + + meta = with lib; { + homepage = "https://toil.ucsc-cgl.org/"; + license = with licenses; [ asl20 ]; + description = "Workflow engine written in pure Python"; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 3dd241840c70..531d5a547e6e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.2.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1sw6b1jaddacfm4kvvhgxn743khmsi1c4b4f5mgvm3rabv0h473h"; + sha256 = "0mq6hmb3wvj0ash27h4zyl46l3fikpf0mv3ng330lcy6v7bhy5b8"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix b/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix index 8b91b5e5fa58..9c62198cb0f3 100644 --- a/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix +++ b/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "a4ksubtitles"; namespace = "service.subtitles.a4ksubtitles"; - version = "2.6.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "a4k-openproject"; repo = "a4kSubtitles"; rev = "${namespace}/${namespace}-${version}"; - sha256 = "1rzgrxdcws064ji65fdbzzmgd2pdlaak3apa5n1clkmzknn7n881"; + sha256 = "0fg5mcvxdc3hqybp1spy7d1nnqirwhcvrblbwksikym9m3qgw2m5"; }; propagatedBuildInputs = [ diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix index 965b8d8189a2..08257ff25425 100644 --- a/pkgs/build-support/emacs/elpa.nix +++ b/pkgs/build-support/emacs/elpa.nix @@ -28,7 +28,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ emacs --batch -Q -l ${./elpa2nix.el} \ -f elpa2nix-install-package \ - "${src}" "$out/share/emacs/site-lisp/elpa" + "$src" "$out/share/emacs/site-lisp/elpa" runHook postInstall ''; diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/development/compilers/rasm/default.nix index 0feaabc92e62..0f617d0f6618 100644 --- a/pkgs/development/compilers/rasm/default.nix +++ b/pkgs/development/compilers/rasm/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.117"; src = fetchurl { - url = "www.roudoudou.com/export/cpc/rasm/${pname}_v0117_src.zip"; + url = "http://www.roudoudou.com/export/cpc/rasm/${pname}_v0117_src.zip"; sha256 = "1hwily4cfays59qm7qd1ax48i7cpbxhs5l9mfpyn7m2lxsfqrl3z"; }; diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix index 735cc278debf..5340306de79a 100644 --- a/pkgs/development/libraries/xlibs-wrapper/default.nix +++ b/pkgs/development/libraries/xlibs-wrapper/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation { propagatedBuildInputs = packages; preferLocalBuild = true; -} // { + # For compatability with XFree86. - buildClientLibs = true; + passthru.buildClientLibs = true; meta = { platforms = lib.platforms.unix; diff --git a/pkgs/development/ocaml-modules/luv/default.nix b/pkgs/development/ocaml-modules/luv/default.nix index 41fdbc4eedcd..8aaf1bcbddb4 100644 --- a/pkgs/development/ocaml-modules/luv/default.nix +++ b/pkgs/development/ocaml-modules/luv/default.nix @@ -6,12 +6,12 @@ buildDunePackage rec { pname = "luv"; - version = "0.5.8"; + version = "0.5.9"; useDune2 = true; src = fetchurl { url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz"; - sha256 = "1y3g7jvb72frckjl92zyn7hzmzjy1fy4a48992jdk80vphsdzgmk"; + sha256 = "0bbv28vgv5mnfbn1gag5fh3n4d9nkffqy3bif3pf47677c493ym2"; }; postConfigure = '' diff --git a/pkgs/development/python-modules/addict/default.nix b/pkgs/development/python-modules/addict/default.nix new file mode 100644 index 000000000000..2bb531cff908 --- /dev/null +++ b/pkgs/development/python-modules/addict/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "addict"; + version = "2.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b3b2210e0e067a281f5646c8c5db92e99b7231ea8b0eb5f74dbdf9e259d4e494"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "addict" ]; + + meta = with lib; { + description = "Module that exposes a dictionary subclass that allows items to be set like attributes"; + homepage = "https://github.com/mewwts/addict"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index a9af41c499d7..eacaa00f1526 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -15,12 +15,12 @@ }: buildPythonPackage rec { - version = "0.20.23"; + version = "0.20.24"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QC5WtcB/BAR50RiOXC9AbiwAaqOUMIAVXUxtBeX8qGU="; + sha256 = "1wacchqxxwbhwnfnnhlb40s66f92lkvz6423j4c1w6wb585aqqbb"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix new file mode 100644 index 000000000000..8f58720bd264 --- /dev/null +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, blessed +, prefixed +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "enlighten"; + version = "1.10.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "3391916586364aedced5d6926482b48745e4948f822de096d32258ba238ea984"; + }; + + propagatedBuildInputs = [ + blessed + prefixed + ]; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "enlighten" ]; + disabledTests = + # https://github.com/Rockhopper-Technologies/enlighten/issues/44 + lib.optional stdenv.isDarwin "test_autorefresh" + ; + + meta = with lib; { + description = "Enlighten Progress Bar for Python Console Apps"; + homepage = "https://github.com/Rockhopper-Technologies/enlighten"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/prefixed/default.nix b/pkgs/development/python-modules/prefixed/default.nix new file mode 100644 index 000000000000..d5837fd90a1c --- /dev/null +++ b/pkgs/development/python-modules/prefixed/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "prefixed"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "ca48277ba5fa8346dd4b760847da930c7b84416387c39e93affef086add2c029"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "prefixed" ]; + + meta = with lib; { + description = "Prefixed alternative numeric library"; + homepage = "https://github.com/Rockhopper-Technologies/prefixed"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/requests-futures/default.nix b/pkgs/development/python-modules/requests-futures/default.nix new file mode 100644 index 000000000000..cc6eb312431e --- /dev/null +++ b/pkgs/development/python-modules/requests-futures/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage, fetchPypi, requests, lib }: + +buildPythonPackage rec { + pname = "requests-futures"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "35547502bf1958044716a03a2f47092a89efe8f9789ab0c4c528d9c9c30bc148"; + }; + + propagatedBuildInputs = [ requests ]; + + # tests are disabled because they require being online + doCheck = false; + + pythonImportsCheck = [ "requests_futures" ]; + + meta = with lib; { + description = "Asynchronous Python HTTP Requests for Humans using Futures"; + homepage = "https://github.com/ross/requests-futures"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ applePrincess ]; + }; +} diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index f6cd67d70bc2..d1a6330df7bd 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-heri1vb0KykEqef8uBfEazPzTgz8jjYSUB0dpPiDJ7g="; + sha256 = "sha256-kNwRnoUkX2dmj6ii9fRu/Hv4V3/sz6ag+wUPf93tmTQ="; }; - cargoSha256 = "sha256-v/yafzfAy1SBjeFwaMEWVTGJH3Fv1CYYU70TA7AUUsk="; + cargoSha256 = "sha256-5ukTSzDFCkBQ1UFfnpz1fFzJSHBYUoZAvhPGMkr/fIs="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 0a342997530f..38293e65f70f 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, windows, fetchurl }: let - version = "6.0.0"; + version = "9.0.0"; in stdenv.mkDerivation { pname = "mingw-w64"; inherit version; src = fetchurl { url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; - sha256 = "1w28mynv500y03h92nh87rgw3fnp82qwnjbxrrzqkmr63q812pl0"; + sha256 = "10a15bi4lyfi0k0haj0klqambicwma6yi7vssgbz8prg815vja8r"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index ff676b277635..3b67c64ffb7a 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.23.4.4805-186bae04e"; + version = "1.23.5.4841-549599676"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "161baz4klwb8wyvc3mnbvvwjcmdfp38rn270jwvmwzp6b70jclyx"; + sha256 = "168aill68fcq3cv3a78yhqnfxziww8r80is179y9jxmhymnmzp9q"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0vj7k81fl8chaxqz287arvn9vva4cd4wcnybc5yvls3589h9x1zq"; + sha256 = "0cp2likx2dqy6j5icp5n07kg1md9qvq9vsh4818m86r2p015qlvb"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/tools/archivers/arj/default.nix b/pkgs/tools/archivers/arj/default.nix new file mode 100644 index 000000000000..e09e390fa473 --- /dev/null +++ b/pkgs/tools/archivers/arj/default.nix @@ -0,0 +1,150 @@ +{stdenv, lib, fetchurl, fetchpatch, autoreconfHook}: + +stdenv.mkDerivation rec { + pname = "arj"; + version = "3.10.22"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1nx7jqxwqkihhdmdbahhzqhjqshzw1jcsvwddmxrwrn8rjdlr7jq"; + }; + + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/001_arches_align.patch"; + sha256 = "0i3qclm2mh98c04rqpx1r4qagd3wpxlkj7lvq0ddpkmr8bm0fh0m"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/002_no_remove_static_const.patch"; + sha256 = "0zfjqmjsj0y1kfzxbp29v6nxq5qwgazhb9clqc544sm5zn0bdp8n"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/003_64_bit_clean.patch"; + sha256 = "0mda9fkaqf2s1xl6vlbkbq20362h3is9dpml9kfmacpbifl4dx3n"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/004_parallel_build.patch"; + sha256 = "0gam6k7jknzmbjlf1r6c9kjh5s5h76pd31v59cnaqiycwiy8z6q9"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/005_use_system_strnlen.patch"; + sha256 = "0q0ypm8mdsxd0rl1k0id6fdx5m7mvqgwcla4r250cmc6zqzpib6d"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/006_use_safe_strcpy.patch"; + sha256 = "1garad95s34cix3kd77lz37andrcnz19glzkfdnkjaq7ldvzwikc"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/hurd_no_fcntl_getlk.patch"; + sha256 = "0b3hpn4qypimrw9ar2n4h24886sl6pmim4lb4ly1wqcq0f73arva"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security_format.patch"; + sha256 = "0q67cvln55p38bm0xwd2cgppqmkp2nfar2pg1zj78f7ncn35lbvf"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/doc_refer_robert_k_jung.patch"; + sha256 = "1wxdx0m6a9vdvjlaycwsissn75l1ni7grg8n6qmkynz2vrcvgzb1"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_fix.patch"; + sha256 = "19ycp1rak7l6ql28m50v95ls621w3sl8agw5r5va73svkgh8hc3g"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_flags.patch"; + sha256 = "1jw1y9i9lw1idgi4l9cycwsql1hcz1m4f3k2iybwsgx0acaw695q"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_strip.patch"; + sha256 = "1b18khj6cxnjyqk2ycygwqlcs20hrsbf4h6bckl99dxnpbq5blxi"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_pie.patch"; + sha256 = "1jqswxgc1plipblf055n9175fbanfi6fb67lnzk8dcvxjn227fs3"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/self_integrity_64bit.patch"; + sha256 = "0s5zdq81a0f83hdg9hy6lqn3xvckx9y9r20awczm9mbf11vi01cb"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security-afl.patch"; + sha256 = "0yajcwpghij8wg21a0kkp3f9x7anz5m121jx2vnkyn04bvi9541a"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security-traversal-dir.patch"; + sha256 = "10lv3867k0wm2s0cyf40hkxfqbjaxm4aph5ivk2q2rjkracrn2y4"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security-traversal-symlink.patch"; + sha256 = "095pdfskxwh0jnyy31dpz10s2ppv8n7lvvn4q722y3g71d0c79qq"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/out-of-bounds-read.patch"; + sha256 = "0ps9lqkbqzlhzr2bnr47sir431z1nywr7nagkmk42iki4d96v0jq"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/remove_build_date.patch"; + sha256 = "1vjlfq6firxpj068l9acyqs77mfydn1rwgr2jmxgsy9mq0fw1dsc"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/reproducible_help_archive.patch"; + sha256 = "0l3qi9f140pwc6fk8qdbxx4g9d8zlf45asimmr8wfpbi4pf59n8i"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_cross.patch"; + sha256 = "1vb0vbh3jbxj192q47vg3f41l343ghcz2ypbrrm2bkbpwm5cl8qr"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/fix-time_t-usage.patch"; + sha256 = "012c6pnf5y4jwn715kxn3vjy088rm905959j6yh8bslyx84qaijv"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_fix_autoreconf.patch"; + sha256 = "0yhxbdasnbqcg1nyx2379fpbr7fmdlv4n2nlxrv1z1vbc7rlvw9d"; + }) + ]; + + nativeBuildInputs = [ autoreconfHook ]; + + preAutoreconf = '' + cd gnu + ''; + + postConfigure = '' + cd .. + ''; + + meta = with lib; { + description = "Open-source implementation of the world-famous ARJ archiver"; + longDescription = '' + This version of ARJ has been created with an intent to preserve maximum + compatibility and retain the feature set of the original ARJ archiver as + provided by ARJ Software, Inc. + ''; + license = licenses.gpl2Plus; + maintainers = [ maintainers.sander ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index acb2d41e0456..aaef2dd2d084 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-atsfaoA0V9PPwhPTpHI7b7A5JsDiYHfA+0NlNOKYIPg="; + sha256 = "sha256-hdm1ObzN9pFLeO1ujobHxiQYnA+dg9zIp/qho6S0H78="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix index 560ad4604713..cc2d979ca757 100644 --- a/pkgs/tools/misc/code-minimap/default.nix +++ b/pkgs/tools/misc/code-minimap/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "code-minimap"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nWfvRrKkUrr2owv9sLgORVPYp68/Ibdu/P1VddMb61s="; + sha256 = "sha256-eCHmMtndcQJqKmjxhkcLvjMUXApkSnH+7qyG7PDfcwo="; }; - cargoSha256 = "sha256-OmWn6Z/r/gXMD4gp/TDo0Hokliq8Qgb354q8ZFpVG2s="; + cargoSha256 = "sha256-wKCANWznOJMlQ8T2q39NNNRmgPYMpbkJhXpxojusNsE="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix index fb69610e4ef7..73d86e7dfc65 100644 --- a/pkgs/tools/misc/kisslicer/default.nix +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation { stripRoot = false; }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - buildInputs = [ makeWrapper libGLU libGL diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/tools/misc/vial/default.nix index 2900a64299f0..c8d38d826d1f 100644 --- a/pkgs/tools/misc/vial/default.nix +++ b/pkgs/tools/misc/vial/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, appimageTools }: let name = "vial-${version}"; - version = "0.3"; + version = "0.4"; pname = "Vial"; src = fetchurl { url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - sha256 = "sha256-hUwVp2tpKelbISQU/Q30yUeQfWp56dtgtfF/rpq1h5M="; + sha256 = "sha256-4EDEVSqjQ6Ybqx4BoNwE4pT5yFLYM05FBHc5deQU9f8="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index 97c758e19b4d..54de621763c5 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "telepresence2"; - version = "2.2.1"; + version = "2.3.6"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - sha256 = "0pr6vm68jr5ld7hy2b4dwmjziir59vg137c74rdn1wlhq3n8vr41"; + sha256 = "1bs4h450109vhy18kpyy6y4p5l9kvz4w09m56fxh5z547m5ax6k3"; }; - vendorSha256 = "0d0p879zchhrzrf6f5zc3vdcd5zi1ind7ibvb46y6wx6lp0f1nrp"; + vendorSha256 = "0xmw9mc0iy64kb12lsii4nn63ynh6gab9ls8z6mrizjjqz845sa5"; buildFlagsArray = '' -ldflags=-s -w -X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev} diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix index bd558b7ab66d..e0252dac820a 100644 --- a/pkgs/tools/security/ecryptfs/helper.nix +++ b/pkgs/tools/security/ecryptfs/helper.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0gp4m22zc80814ng80s38hp930aa8r4zqihr7jr23m0m2iq4pdpg"; }; - phases = [ "installPhase" ]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 2444d1f1d726..63f25bc12efe 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -61,7 +61,6 @@ let nativeBuildInputs = [ makeWrapper ]; buildInputs = [dpkg]; - phases = [ "unpackPhase" "installPhase" ]; unpackPhase = "dpkg -X $src ."; installPhase='' diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index 37af42e33ccf..176cc5e706bb 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl ]; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/{bin,share} diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 56befbb1f814..dffbaaa81832 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { runVend = true; vendorSha256 = "06hl1npwmy9dvpf4kljvw8lwwiigm52wf106lmf9k6k2gi5ikprz"; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; preCheck = '' export HOME=$(mktemp -d) @@ -28,6 +28,5 @@ buildGoModule rec { changelog = "https://github.com/xxxserxxx/gotop/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = [ maintainers.magnetophon ]; - platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b64a5bb748ec..22ea10d466ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1155,6 +1155,8 @@ in argyllcms = callPackage ../tools/graphics/argyllcms {}; + arj = callPackage ../tools/archivers/arj { }; + arp-scan = callPackage ../tools/misc/arp-scan { }; inherit (callPackages ../data/fonts/arphic {}) @@ -14351,6 +14353,8 @@ in todoist-electron = callPackage ../applications/misc/todoist-electron { }; + toil = callPackage ../applications/science/misc/toil { }; + travis = callPackage ../development/tools/misc/travis { }; tree-sitter = callPackage ../development/tools/parsing/tree-sitter { @@ -25908,6 +25912,8 @@ in nootka = qt5.callPackage ../applications/audio/nootka { }; nootka-unstable = qt5.callPackage ../applications/audio/nootka/unstable.nix { }; + nwg-drawer = callPackage ../applications/misc/nwg-drawer { }; + nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; nwg-menu = callPackage ../applications/misc/nwg-menu { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c4654534e6c9..320115f6ad20 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -199,6 +199,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; }; + addict = callPackage ../development/python-modules/addict { }; + addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; adext = callPackage ../development/python-modules/adext { }; @@ -2297,6 +2299,8 @@ in { enamlx = callPackage ../development/python-modules/enamlx { }; + enlighten = callPackage ../development/python-modules/enlighten { }; + enocean = callPackage ../development/python-modules/enocean { }; enrich = callPackage ../development/python-modules/enrich { }; @@ -5544,6 +5548,8 @@ in { precis-i18n = callPackage ../development/python-modules/precis-i18n { }; + prefixed = callPackage ../development/python-modules/prefixed { }; + pre-commit = callPackage ../development/python-modules/pre-commit { }; pre-commit-hooks = callPackage ../development/python-modules/pre-commit-hooks { }; @@ -7542,6 +7548,8 @@ in { requests-file = callPackage ../development/python-modules/requests-file { }; + requests-futures = callPackage ../development/python-modules/requests-futures { }; + requests-http-signature = callPackage ../development/python-modules/requests-http-signature { }; requests-kerberos = callPackage ../development/python-modules/requests-kerberos { };