From df8a72b1f294ee804c18e04b35657a0662dbae21 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Mon, 23 May 2022 08:50:40 -0700 Subject: [PATCH 01/18] github-runner: 2.291.1 -> 2.292.0 (cherry picked from commit 36fbecf10917959e538a81512684510d1efe94b0) --- .../tools/continuous-integration/github-runner/default.nix | 6 +++--- .../github-runner/patches/dir-proj.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index abd77dd1f4ae..8718cd8dc80a 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.291.1"; + version = "2.292.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-0Eijq2vXY+Y2g3bhEhIGnFxTCLXpw7k3iXpgj3x8nL4="; + hash = "sha256-vmHUu4coAxFLfi+G4xLjy3+LzFnmGllhWhCXcWuDQnc="; }; nativeBuildInputs = [ @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { postPatch = '' # Relax the version requirement substituteInPlace src/global.json \ - --replace '6.0.100' '${dotnetSdk.version}' + --replace '6.0.300' '${dotnetSdk.version}' # Disable specific tests substituteInPlace src/dir.proj \ diff --git a/pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch b/pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch index 9a75b12544a8..2bfda30e3244 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch +++ b/pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch @@ -35,7 +35,7 @@ index 1c91e0c..8b27d3f 100644 - -- +- + + From ebcf4a97613a96ef55f128c4eaaf3da39715b830 Mon Sep 17 00:00:00 2001 From: Ionut Nechita Date: Mon, 13 Jun 2022 20:35:43 +0300 Subject: [PATCH 02/18] yandex-browser: 22.1.3.907-1 -> 22.5.0.1879-1 Signed-off-by: Ionut Nechita Change-Id: I70fd2e794ce0bc209678646e692b10177d7a7b34 --- .../networking/browsers/yandex-browser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index dab9794277f6..a643fd98affb 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { pname = "yandex-browser"; - version = "22.1.3.907-1"; + version = "22.5.0.1879-1"; src = fetchurl { url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb"; - sha256 = "sha256-7dbFqNzZP2CyseK0xD9zcvecIuueZfMy5KgN8gRRLEk="; + sha256 = "5cfd6f170e3b4c06ec4c50bd1efae04174b5a6073371e89f9ca3641b6cf7e790"; }; nativeBuildInputs = [ @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { installPhase = '' cp $TMP/ya/{usr/share,opt} $out/ -R substituteInPlace $out/share/applications/yandex-browser-beta.desktop --replace /usr/ $out/ - ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser + ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser-beta ''; runtimeDependencies = map lib.getLib [ From 463675efd78bf9cc03ab1bf7b1f56dfa687f6e40 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 5 Mar 2022 18:50:28 -0800 Subject: [PATCH 03/18] submitting-changes.chapter.md: explain that purple arrows are manual The documentation for this diagram explains that the blue arrows are automatic processes which happen every six hours. There is no explanation about how the purple arrows happen or how often. As a new contributor to nixpkgs, I incorrectly assumed that the purple arrows were also automatic processes (they aren't), which left me sort of confused about what the whole scheme was accomplishing. Recently I went through the github history to see how often these events happen, and realized that the purple arrows are (a) triggered manually by a nixpkgs project member and (b) happen much, much, much less frequently than every six hours. Now everything makes a lot more sense. I suggest the wording change in this commit, or something similar, to save future contributors the same confusion that I experienced. (cherry picked from commit 94c0e08808ce3529e4ace6584626d94ca07f21ee) --- doc/contributing/submitting-changes.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index 6f87e015b9cf..f3c6d172ae34 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -227,7 +227,7 @@ digraph { } ``` -[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours. +[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours; these are the blue arrows in the diagram above. The purple arrows in the diagram above are done manually and much less frequently. You can get an idea of how often these merges occur by looking at the `git-log` for `master` and searching for `from NixOS/staging-next` (for the upper purple arrow) or `staging-next into staging` (for the lower arrow). ### Master branch {#submitting-changes-master-branch} From 807db9e5e8358f6efc14fc6f8b677097a3d9e5e6 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 20 Apr 2022 03:22:17 -0700 Subject: [PATCH 04/18] submitting-changes.chapter.md: avoid being specific There is some doubt as to exactly how to enumerate all the merges from one branch to another reliably. In the meantime, let's be a little more vague. (cherry picked from commit 50217b01dd68cb4dfc24ecfa568b7f1b69a092cc) --- doc/contributing/submitting-changes.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index f3c6d172ae34..471e45d7dfb3 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -227,7 +227,7 @@ digraph { } ``` -[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours; these are the blue arrows in the diagram above. The purple arrows in the diagram above are done manually and much less frequently. You can get an idea of how often these merges occur by looking at the `git-log` for `master` and searching for `from NixOS/staging-next` (for the upper purple arrow) or `staging-next into staging` (for the lower arrow). +[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours; these are the blue arrows in the diagram above. The purple arrows in the diagram above are done manually and much less frequently. You can get an idea of how often these merges occur by looking at the git history. ### Master branch {#submitting-changes-master-branch} From 9a9042bfbfa3e801c888bf9238e672c7c5a32837 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 16 Jun 2022 23:28:20 +0200 Subject: [PATCH 05/18] networkmanager: 1.38.0 -> 1.38.2 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/compare/1.38.0...1.38.2 (cherry picked from commit e8f62e992d72768fc0a5df22ff902e53c25bae6a) --- pkgs/tools/networking/networkmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 5dc59f9590f5..c85d7ef61281 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -54,11 +54,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.38.0"; + version = "1.38.2"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-gqTPB93+sIFnh7Z8D1BYrmxQ1iWcCwVBok41FWBisu8="; + sha256 = "sha256-nP/SrcaGUTFt8tL4oJ4XF7sdDC6jic/HIaAQnbmzWCY="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; From ed4228ceee8fdbc69648f00e23e54f03398b9af3 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Thu, 16 Jun 2022 20:49:36 -0600 Subject: [PATCH 06/18] signal-desktop: 5.45.1 -> 5.46.0 (cherry picked from commit 523bed764cb6900d86e2de5e9860c71e15323e1e) --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 1c99ded65447..a9cbfadd9480 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.45.1"; # Please backport all updates to the stable channel. + version = "5.46.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-ZkQQL05pz06iszguXkrBt/h4PoZcbybX4CmDXOoMYkw="; + sha256 = "sha256-zy9nETD82KguML0MXe8hlB4m+fBCMmJ1z/2Neq6QvEU="; }; nativeBuildInputs = [ From a4fa94965acf7b15d15816f5705d43e6afd08447 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 15 Jun 2022 12:44:17 -0700 Subject: [PATCH 07/18] python3Packages.pytorch: unbreak on Darwin * Add missing `buildInputs`. * Enable Grand Central Dispatch support for `aarch64-darwin`. * Remove `postFixup` steps for .dylib files that aren't present. (cherry picked from commit c1d5efbee20eaf5a2748dbb5e08eaf304b7b3f34) --- .../python-modules/pytorch/default.nix | 20 ++++++------------- pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index d6e78c31d753..699b135bd7b6 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -10,6 +10,7 @@ # Build inputs numactl, + CoreServices, libobjc, # Propagated build inputs numpy, pyyaml, cffi, click, typing-extensions, @@ -145,7 +146,7 @@ in buildPythonPackage rec { # https://github.com/pytorch/pytorch/issues/70297 # https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e ./breakpad-sigstksz.patch - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ # pthreadpool added support for Grand Central Dispatch in April # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO) # that is available starting with macOS 10.13. However, our current @@ -225,7 +226,8 @@ in buildPythonPackage rec { buildInputs = [ blas blas.provider ] ++ lib.optionals cudaSupport [ cudnn magma nccl ] - ++ lib.optionals stdenv.isLinux [ numactl ]; + ++ lib.optionals stdenv.isLinux [ numactl ] + ++ lib.optionals stdenv.isDarwin [ CoreServices libobjc ]; propagatedBuildInputs = [ cffi @@ -291,15 +293,6 @@ in buildPythonPackage rec { install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libtorch.dylib - install_name_tool -change @rpath/libtorch.dylib $lib/lib/libtorch.dylib $lib/lib/libcaffe2_observers.dylib - install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libcaffe2_observers.dylib - - install_name_tool -change @rpath/libtorch.dylib $lib/lib/libtorch.dylib $lib/lib/libcaffe2_module_test_dynamic.dylib - install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libcaffe2_module_test_dynamic.dylib - - install_name_tool -change @rpath/libtorch.dylib $lib/lib/libtorch.dylib $lib/lib/libcaffe2_detectron_ops.dylib - install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libcaffe2_detectron_ops.dylib - install_name_tool -change @rpath/libtorch.dylib $lib/lib/libtorch.dylib $lib/lib/libshm.dylib install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libshm.dylib ''; @@ -315,12 +308,11 @@ in buildPythonPackage rec { }; meta = with lib; { - # darwin: error: use of undeclared identifier 'noU'; did you mean 'no'? - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Open source, prototype-to-production deep learning platform"; homepage = "https://pytorch.org/"; license = licenses.bsd3; - platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin; maintainers = with maintainers; [ teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds + platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin; + broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0010a67d1a5d..8543259d638c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8629,6 +8629,8 @@ in { pytorch = callPackage ../development/python-modules/pytorch { cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; + inherit (pkgs.darwin) libobjc; }; pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { }; From b389f332aed224e4887453c7880ba5f32354dd24 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 17 Jun 2022 13:58:03 +0100 Subject: [PATCH 08/18] conftest: 0.32.0 -> 0.32.1 (cherry picked from commit acddbacee4ccffb0bcd86ccfbacf4df78f0dbddb) --- pkgs/development/tools/conftest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 2bd5789c3e3c..0aebf2363f53 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.32.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "sha256-fPg3376QtbjrUJWZxjRqEFL2cWy1xb7vUX1Lfp5WFmY="; + sha256 = "sha256-lmz5ALGvTwPiz0PaGYlL3UTd6tYgO5rpUHXFoLKgS7E="; }; - vendorSha256 = "sha256-/RfIjCI2RMktUSVEoyJqMwdmlW6lGvXanX7RBxiaTyE="; + vendorSha256 = "sha256-Y0S759iPSU7kboa9GxC56QR3caOG9gEmEG44B1Lp3w4="; ldflags = [ "-s" From 04574484d889651b28e0d0ed9c3ea6abb6932d9d Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Fri, 17 Jun 2022 00:21:05 +0000 Subject: [PATCH 09/18] vscodium: 1.68.0 -> 1.68.1 (cherry picked from commit 1a0d8eebd7d0322343985768e8526513e883e8ea) --- pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index d51286d82c5b..251c85ea5cba 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -14,11 +14,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0k3m6gdmcv5blfczb7wnvsslq9sx07rbmzbs1q1yf9mb5q916dcf"; - x86_64-darwin = "0074vrjvv52gss0cibgkfkkf6g5fjcwjhz8bpl4b42j07qryh642"; - aarch64-linux = "1ps8ql740832gdjx7kwsi8akbdgk7lx1l85hg1aa5qwgm65xcb0g"; - aarch64-darwin = "1gqzwy5fkmbw2zmcgiakczr51zv9rlkhp7aq182p43jrsk6lqqnn"; - armv7l-linux = "0km1vjd2jnl9kxfxz52fkf2jkqhx121jngxjcy581fhnipp268zb"; + x86_64-linux = "1gx64ff9sgjqn8vw2hjpn3qlfpfyyhc5ivzc52vqyczaj1fcny65"; + x86_64-darwin = "0sv0iyqfw24k14r28qzvlpdb81b7fqhbgb1lqzb75adhdfpjwz31"; + aarch64-linux = "13mg7nn43k4bs1gl8cx1kly90yxz7iial6a1fpy4grxsk8mna1rj"; + aarch64-darwin = "0mnj3lckpqwb3kmg7x7r34idaxyhy55gpiiyj0gmpqp8hp0ai5sc"; + armv7l-linux = "0cvvigzmqp21jxwdfpkspdj7sva9bj977f9689qgb012kqvy41b2"; }.${system}; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -28,7 +28,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.68.0"; + version = "1.68.1"; pname = "vscodium"; executableName = "codium"; From 5a9a5c545fbc15aed258db8210e1657380965d32 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Thu, 16 Jun 2022 00:24:43 +0000 Subject: [PATCH 10/18] vscode: 1.68.0 -> 1.68.1 (cherry picked from commit 58b2655b4c2dfe990aa8147e247e617ad5dae085) --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 912af05e6d3e..9f85c9f9a150 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1kvb92ygsvzi06nqwd6d9dlqbz44dxcjm0iq1rvvxnr7x33l8218"; - x86_64-darwin = "0jz0nik6wkqhgmfnhiwsq510hxbc9jw0z7s84154p2lhwcmpsbjp"; - aarch64-linux = "16jzpzxxmcq690d3w0ph0cnzhpyvjpk8ih48pyzzf25bgp94yi33"; - aarch64-darwin = "00xw4xml4zijpqj8305gdgn15shllpkv9ld1yh1aqrz11v522w3h"; - armv7l-linux = "0fzzdh9gkw51djrdwhzi3fbjxkm2l78v72gc0233xm8riq0gczsv"; + x86_64-linux = "0rq0bc99hsji4ni5mqw1rhzn2rng9rldm4xbdxlkrjyprc6qvffz"; + x86_64-darwin = "1yjcb65w0anxyjc1nd9kbwr4hwnrlk9c6kp1a2ncy1g181klzarl"; + aarch64-linux = "1fk7887clz9sd7fmz7lkxql7bnsvnbjd9fjixym2746x9if5ds42"; + aarch64-darwin = "1bfgsjnm5r1wpss69ncx310j23mbwhixdxmg07m3kpcfqrmznvgc"; + armv7l-linux = "0131i5cx2737wmngybvlw7d9c4gnilmla33nlrhf74ihic98jwlc"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.68.0"; + version = "1.68.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 354b2a0b680a36debc9a76a139a12e48a406feae Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Thu, 16 Jun 2022 07:17:33 +0300 Subject: [PATCH 11/18] pythonPackages.pychm,python3Packages.pychm: init at 0.8.6 (cherry picked from commit a07a6083423962a27c936940e6f6c75be9fac469) --- .../python-modules/pychm/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/pychm/default.nix diff --git a/pkgs/development/python-modules/pychm/default.nix b/pkgs/development/python-modules/pychm/default.nix new file mode 100644 index 000000000000..e9cc2c319fff --- /dev/null +++ b/pkgs/development/python-modules/pychm/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, chmlib +}: + +buildPythonPackage rec { + pname = "pychm"; + version = "0.8.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wpn9ijlsmrpyiwg3drmgz4dms1i1i347adgqw37bkrh3vn6yq16"; + }; + + buildInputs = [ chmlib ]; + + pythonImportsCheck = [ "chm" ]; + + meta = with lib; { + description = "Library to manipulate Microsoft HTML Help (CHM) files"; + homepage = "https://github.com/dottedmag/pychm"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ alexshpilkin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0010a67d1a5d..6c07bf45ee31 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7023,6 +7023,8 @@ in { pychef = callPackage ../development/python-modules/pychef { }; + pychm = callPackage ../development/python-modules/pychm { }; + PyChromecast = callPackage ../development/python-modules/pychromecast { }; pyclimacell = callPackage ../development/python-modules/pyclimacell { }; From 10ebb731ee93dbdeab08a4963305fb482eb129e1 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Thu, 16 Jun 2022 07:19:21 +0300 Subject: [PATCH 12/18] calibre: fix chm processing dependency (cherry picked from commit 7d883da22ad7c804fbc138652f868abfe60b0300) --- pkgs/applications/misc/calibre/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 753be1eb88cf..d25998cb17b1 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -16,7 +16,6 @@ , hunspell , hyphen , unrarSupport ? false -, chmlib , python3Packages , libusb1 , libmtp @@ -66,7 +65,6 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config qmake removeReferencesTo wrapGAppsHook ]; buildInputs = [ - chmlib fontconfig hunspell hyphen @@ -102,6 +100,7 @@ mkDerivation rec { msgpack netifaces pillow + pychm pyqt-builder pyqt5 python From 2f361cb7e75a9e05d98a37ac70d7c69fbc57e142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Sat, 18 Jun 2022 10:27:05 +0200 Subject: [PATCH 13/18] hydrus: 483 -> 488d (#177770) Backport of: - hydrus: 483 -> 484 (95191d4f6131a892caf5bb46833f7d39108b4ce0) - hydrus: 484 -> 487 (dcfeb8a826582e84c68e64a9d8f0d9e336252f8b) - hydrus: 487 -> 488d (4ac196b95eca02659341f6553a64d3d5e5d237b8) --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 39eefb003452..dcebff3fcf3a 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "483"; + version = "488d"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-UU3XQ0NC/apJ0S/uDDNG+8DOD+sRyX98yMcjtL2Htig="; + sha256 = "sha256-FWiopOf+eabiWAfjQW83V7I/e5lOLUVW3djoQePHPRs="; }; nativeBuildInputs = [ From 91e813ba57d6b90c0d47a32a758fe6bf5f135511 Mon Sep 17 00:00:00 2001 From: Victor Fuentes Date: Sun, 5 Jun 2022 12:32:34 -0700 Subject: [PATCH 14/18] calamares: 3.2.57 -> 3.2.59 (cherry picked from commit c50f620c3351e87b84eea8159673a6ca4081005a) --- pkgs/tools/misc/calamares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index a73a2821cbf2..d3a1ea13ff85 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.57"; + version = "3.2.59"; # release including submodule src = fetchurl { url = "https://github.com/calamares/calamares/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "ef7f564ec2cd8baaf94a44982ce1db88c1192696617f21538d0b8472a63b4c2b"; + sha256 = "55adef250613e80a868f2aa3d1e57bdae5b769387d91decf0fe2b64e3605574f"; }; patches = lib.optionals nixos-extensions [ From bd8749bcc194fe124f7316bfe4587a8bf84160c8 Mon Sep 17 00:00:00 2001 From: Victor Fuentes Date: Sun, 5 Jun 2022 12:35:51 -0700 Subject: [PATCH 15/18] calamares: increase default verbosity (cherry picked from commit 4b863a0256a24517caad65400bc6664407e10a73) --- pkgs/tools/misc/calamares/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index d3a1ea13ff85..7565aa018253 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -57,7 +57,7 @@ mkDerivation rec { postPatch = '' # Run calamares without root. Other patches make it functional as a normal user - sed -e "s,pkexec calamares,calamares," \ + sed -e "s,pkexec calamares,calamares -D6," \ -i calamares.desktop sed -e "s,X-AppStream-Ignore=true,&\nStartupWMClass=calamares," \ From a17a3845ad9cc997e9592c2e25a2d33b4e1eea5e Mon Sep 17 00:00:00 2001 From: Victor Fuentes Date: Sun, 5 Jun 2022 13:24:33 -0700 Subject: [PATCH 16/18] installation-cd: prevent gnome from sleeping (cherry picked from commit 54fcba5b3bb4d77dd58aa08a489aced93ff5da18) --- .../cd-dvd/installation-cd-graphical-calamares-gnome.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix index 95aeca1a928a..d015e10c11d8 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix @@ -18,7 +18,8 @@ extraGSettingsOverrides = '' [org.gnome.shell] welcome-dialog-last-shown-version='9999999999' - + [org.gnome.desktop.session] + idle-delay=0 [org.gnome.settings-daemon.plugins.power] sleep-inactive-ac-type='nothing' sleep-inactive-battery-type='nothing' From 02257c62a217cff4beb8fcd08cb19aaed3fec164 Mon Sep 17 00:00:00 2001 From: Victor Fuentes Date: Sun, 5 Jun 2022 14:07:25 -0700 Subject: [PATCH 17/18] calamares-nixos-extensions: 0.3.8 -> 0.3.10 (cherry picked from commit d5e616a3f410e082e7dd362b1548b1b322633205) --- pkgs/tools/misc/calamares-nixos-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/calamares-nixos-extensions/default.nix b/pkgs/tools/misc/calamares-nixos-extensions/default.nix index 793f341a0731..a587cd585e1a 100644 --- a/pkgs/tools/misc/calamares-nixos-extensions/default.nix +++ b/pkgs/tools/misc/calamares-nixos-extensions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "calamares-nixos-extensions"; - version = "0.3.8"; + version = "0.3.10"; src = fetchFromGitHub { owner = "NixOS"; repo = "calamares-nixos-extensions"; rev = version; - sha256 = "MtqAOwlY5euVNAGRl2pRkbg/OolJPNOSQcR4DS5gFz4="; + sha256 = "YJyK0rsrftrCwYD+aCAkPe/kAqUXsP/4WBAGtNKIGj8="; }; installPhase = '' From 4b1707c38e05cb355ff0bf25fb52dbfcea1c0f09 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Jun 2022 11:02:20 +0200 Subject: [PATCH 18/18] lowdown: 0.11.1 -> 1.0.0 Only minor changes: https://github.com/kristapsdz/lowdown/blob/edca6ce6d5336efb147321a43c47a698de41bb7c/versions.xml#L1352-L1358 (cherry picked from commit 5253f82b7bec521671409b39d7469efdc98e48a3) --- pkgs/tools/typesetting/lowdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 88e3a9720d04..1549de886215 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.11.1"; + version = "1.0.0"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "1l0055g8v0dygyxvk5rchp4sn1g2lakbf6hhq0wkj6nxkfpl43mkyc4vpb02r7v6iqfdwq4461dmdi78blsb3nj8b1gcjx75v7x9pa1"; + sha512 = "2izqgzk677y511kms09c0hgar2ax5cd5hspr8djsa3qykaxq0688xkgfad00bl6j0jpixna714ipvqa0gxm480iz2sma7qhdgr6bl4x"; }; # Upstream always passes GNU-style "soname", but cctools expects "install_name".