From 918d088a656aa1b392f43e0a907cb6612b350984 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 31 Oct 2023 09:49:13 +0100 Subject: floorp: 11.5.0 -> 11.5.1 Signed-off-by: Christoph Heiss --- pkgs/applications/networking/browsers/floorp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index c144704fa13..a4796d93954 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -7,7 +7,7 @@ ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.5.0"; + packageVersion = "11.5.1"; applicationName = "Floorp"; binaryName = "floorp"; version = "155.4.0"; @@ -17,7 +17,7 @@ repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-adK3LAu3cDh6d+GvtnkWmSnxansnSZoIgtA9TAqIMyA="; + hash = "sha256-988jKyfIGZ2UPHTNO1cK2lxR/5j3U/QYR3ZI9WsvHUI="; }; extraConfigureFlags = [ -- cgit 1.4.1 From 54ea3c518b55b79ad7e893cb40c0c4278151c606 Mon Sep 17 00:00:00 2001 From: mingmingrr <12855406+mingmingrr@users.noreply.github.com> Date: Sat, 4 Nov 2023 20:47:15 -0400 Subject: picotool: add udev rules --- pkgs/development/tools/picotool/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/picotool/default.nix b/pkgs/development/tools/picotool/default.nix index 0f4300fc67c..03d3d440c29 100644 --- a/pkgs/development/tools/picotool/default.nix +++ b/pkgs/development/tools/picotool/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk" ]; + postInstall = '' + install -Dm444 ../udev/99-picotool.rules -t $out/etc/udev/rules.d + ''; + meta = with lib; { homepage = "https://github.com/raspberrypi/picotool"; description = "Tool for interacting with a RP2040 device in BOOTSEL mode, or with a RP2040 binary"; -- cgit 1.4.1 From b44a0a505916125b04b859fb92a085065d684e20 Mon Sep 17 00:00:00 2001 From: Rhys Davies Date: Mon, 6 Nov 2023 11:21:39 +1300 Subject: microsoft-edge: 118.0.2088.76 -> 119.0.2151.44 --- .../networking/browsers/microsoft-edge/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 1c2ac1f8d5f..d034c68d85f 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { stable = import ./browser.nix { channel = "stable"; - version = "118.0.2088.76"; + version = "119.0.2151.44"; revision = "1"; - sha256 = "sha256-cd8W/0UZi+NhPSILR8e8aOLxy6ra+0DVwRowo2jG8DA="; + sha256 = "sha256-QY9Dk4tcpuNJGVcAcaIaVXAT95K87rK7ZQo7COMDpVU="; }; beta = import ./browser.nix { channel = "beta"; - version = "119.0.2151.32"; + version = "119.0.2151.44"; revision = "1"; - sha256 = "sha256-tsDFUKZDiusr/fGO5NMRqzTDIF+MTgC/1gJu95wXwAw="; + sha256 = "sha256-aLiitzCoMvJH2xAfo9bO7lEPMqKlb++BdJkrWx61SMc="; }; dev = import ./browser.nix { channel = "dev"; - version = "120.0.2172.1"; + version = "120.0.2186.2"; revision = "1"; - sha256 = "sha256-EvTS0AO3/A8Ut9H36mMOnS9PRR062WAoas9/Pd90NBM="; + sha256 = "sha256-L/rtOddk4bt8ffkRnq0BYcVjrSb7RmDaay85S5vixSM="; }; } -- cgit 1.4.1 From 1ab5bec1f59cc5ab04160118a967d1334fcc5967 Mon Sep 17 00:00:00 2001 From: ash Date: Tue, 7 Nov 2023 21:41:58 +0000 Subject: xivlauncher: correct meta.homepage --- pkgs/games/xivlauncher/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/xivlauncher/default.nix b/pkgs/games/xivlauncher/default.nix index b88c3ac9477..0a621f625e8 100644 --- a/pkgs/games/xivlauncher/default.nix +++ b/pkgs/games/xivlauncher/default.nix @@ -71,7 +71,7 @@ in meta = with lib; { description = "Custom launcher for FFXIV"; - homepage = "https://github.com/goatcorp/FFXIVQuickLauncher"; + homepage = "https://github.com/goatcorp/XIVLauncher.Core"; license = licenses.gpl3; maintainers = with maintainers; [ sersorrel witchof0x20 ]; platforms = [ "x86_64-linux" ]; -- cgit 1.4.1 From fb396fe845262945ee0b7059170ef305d73a595e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Nov 2023 03:29:03 +0000 Subject: python310Packages.unicodedata2: 15.0.0 -> 15.1.0 --- pkgs/development/python-modules/unicodedata2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix index 5e09df1f6d1..73e34f6ee44 100644 --- a/pkgs/development/python-modules/unicodedata2/default.nix +++ b/pkgs/development/python-modules/unicodedata2/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "unicodedata2"; - version = "15.0.0"; + version = "15.1.0"; disabled = isPy27; src = fetchPypi { inherit version pname; - sha256 = "0bcgls7m2zndpd8whgznnd5908jbsa50si2bh88wsn0agcznhv7d"; + sha256 = "sha256-yzDxia1mSC+FKaRdpxsqiEHpvSuzdswpMwA6SlWgdkg="; }; nativeCheckInputs = [ pytestCheckHook ]; -- cgit 1.4.1 From b6a3fabcc1691a769e0cbe130f08dd5f2a285e02 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 11 Nov 2023 20:51:48 -0800 Subject: rust: allow building/git-bisecting without tarballs This commit adds the machinery required to get our `rustc.nix` to work using upstream's git repository, directly, without them waving dead chickens over it and performing whatever other occult rituals are involved in creating a release tarball. No chickens, live or dead, were harmed in the creation of this commit. --- pkgs/development/compilers/rust/default.nix | 2 +- pkgs/development/compilers/rust/rustc.nix | 22 +++++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 0a0af783236..efd7042c230 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -73,7 +73,7 @@ in patches = rustcPatches; # Use boot package set to break cycle - inherit (bootstrapRustPackages) cargo rustc; + inherit (bootstrapRustPackages) cargo rustc rustfmt; }); rustfmt = self.callPackage ./rustfmt.nix { inherit Security; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 3a649bde95d..1550887c356 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,7 +1,7 @@ { lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, targetPackages , llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages , fetchurl, file, python3 -, darwin, cargo, cmake, rust, rustc +, darwin, cargo, cmake, rust, rustc, rustfmt , pkg-config, openssl, xz , libiconv , which, libffi @@ -24,13 +24,15 @@ let inherit (lib) optionals optional optionalString concatStringsSep; inherit (darwin.apple_sdk.frameworks) Security; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "${targetPackages.stdenv.cc.targetPrefix}rustc"; inherit version; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; inherit sha256; + # See https://nixos.org/manual/nixpkgs/stable/#using-git-bisect-on-the-rust-compiler + passthru.isReleaseTarball = true; }; __darwinAllowLocalNetworking = true; @@ -79,6 +81,12 @@ in stdenv.mkDerivation rec { "--release-channel=stable" "--set=build.rustc=${rustc}/bin/rustc" "--set=build.cargo=${cargo}/bin/cargo" + ] ++ lib.optionals (!(finalAttrs.src.passthru.isReleaseTarball or false)) [ + # release tarballs vendor the rustfmt source; when + # git-bisect'ing from upstream's git repo we must prevent + # attempts to download the missing source tarball + "--set=build.rustfmt=${rustfmt}/bin/rustfmt" + ] ++ [ "--tools=rustc,rust-analyzer-proc-macro-srv" "--enable-rpath" "--enable-vendor" @@ -203,6 +211,14 @@ in stdenv.mkDerivation rec { # See https://github.com/jemalloc/jemalloc/issues/1997 # Using a value of 48 should work on both emulated and native x86_64-darwin. export JEMALLOC_SYS_WITH_LG_VADDR=48 + '' + lib.optionalString (!(finalAttrs.src.passthru.isReleaseTarball or false)) '' + mkdir .cargo + cat > .cargo/config <<\EOF + [source.crates-io] + replace-with = "vendored-sources" + [source.vendored-sources] + directory = "vendor" + EOF ''; # rustc unfortunately needs cmake to compile llvm-rt but doesn't @@ -281,4 +297,4 @@ in stdenv.mkDerivation rec { "i686-windows" "x86_64-windows" ]; }; -} +}) -- cgit 1.4.1 From ae7b2678f39431cf06ab5f80829b82b57ba88be4 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 11 Nov 2023 22:12:01 -0800 Subject: rust: add tutorial on git-bisecting rustc This commits adds to the manual a tutorial showing how to troubleshoot breakage caused by a rustc upgrade in *downstream* packages. --- doc/languages-frameworks/rust.section.md | 64 ++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 3bd8e1c7651..a2d132a2050 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -939,3 +939,67 @@ Fenix also has examples with `buildRustPackage`, [crane](https://github.com/ipetkov/crane), [naersk](https://github.com/nix-community/naersk), and cross compilation in its [Examples](https://github.com/nix-community/fenix#examples) section. +## Using `git bisect` on the Rust compiler {#using-git-bisect-on-the-rust-compiler} + +Sometimes an upgrade of the Rust compiler (`rustc`) will break a +downstream package. In these situations, being able to `git bisect` +the `rustc` version history to find the offending commit is quite +useful. Nixpkgs makes it easy to do this. + +First, roll back your nixpkgs to a commit in which its `rustc` used +*the most recent one which doesn't have the problem.* You'll need +to do this because of `rustc`'s extremely aggressive +version-pinning. + +Next, add the following overlay, updating the Rust version to the +one in your rolled-back nixpkgs, and replacing `/git/scratch/rust` +with the path into which you have `git clone`d the `rustc` git +repository: + +```nix + (final: prev: /*lib.optionalAttrs prev.stdenv.targetPlatform.isAarch64*/ { + rust_1_72 = + lib.updateManyAttrsByPath [{ + path = [ "packages" "stable" ]; + update = old: old.overrideScope(final: prev: { + rustc = prev.rustc.overrideAttrs (_: { + src = lib.cleanSource /git/scratch/rust; + # do *not* put passthru.isReleaseTarball=true here + }); + }); + }] + prev.rust_1_72; + }) +``` + +If the problem you're troubleshooting only manifests when +cross-compiling you can uncomment the `lib.optionalAttrs` in the +example above, and replace `isAarch64` with the target that is +having problems. This will speed up your bisect quite a bit, since +the host compiler won't need to be rebuilt. + +Now, you can start a `git bisect` in the directory where you checked +out the `rustc` source code. It is recommended to select the +endpoint commits by searching backwards from `origin/master` for the +*commits which added the release notes for the versions in +question.* If you set the endpoints to commits on the release +branches (i.e. the release tags), git-bisect will often get confused +by the complex merge-commit structures it will need to traverse. + +The command loop you'll want to use for bisecting looks like this: + +```bash +git bisect {good,bad} # depending on result of last build +git submodule update --init +CARGO_NET_OFFLINE=false cargo vendor \ + --sync ./src/tools/cargo/Cargo.toml \ + --sync ./src/tools/rust-analyzer/Cargo.toml \ + --sync ./compiler/rustc_codegen_cranelift/Cargo.toml \ + --sync ./src/bootstrap/Cargo.toml +nix-build $NIXPKGS -A package-broken-by-rust-changes +``` + +The `git submodule update --init` and `cargo vendor` commands above +require network access, so they can't be performed from within the +`rustc` derivation, unfortunately. + -- cgit 1.4.1 From 06d77c2ff87dfac32754dba7f6b2da9e61c5daa2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Nov 2023 06:27:03 +0000 Subject: cargo-generate: 0.18.4 -> 0.18.5 --- pkgs/development/tools/rust/cargo-generate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index a6ddc95e532..4fb099b3c0b 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.18.4"; + version = "0.18.5"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-u4LEE3fDYneKhNU38VeVNvqcbDO0pws6yldgcvwSv6M="; + sha256 = "sha256-be0jgjhaboutT+c3rRyp6fjmv8nAkggkcqofWmH83Zc="; }; - cargoSha256 = "sha256-pgffaqHWnm3RBE9TGbpRJX35BFpXW/na9wmad9eyCXw="; + cargoHash = "sha256-Sset3+jRm6yOUkvLYxBHdFvVCYOq3bvix9b3pnt7AV8="; nativeBuildInputs = [ pkg-config ]; -- cgit 1.4.1 From 039e11a11baf5c3b82e1a26b6b7abadce81b232e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Nov 2023 07:36:04 +0000 Subject: python311Packages.sgp4: 2.22 -> 2.23 --- pkgs/development/python-modules/sgp4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sgp4/default.nix b/pkgs/development/python-modules/sgp4/default.nix index 242a1c882c9..9f6693603e0 100644 --- a/pkgs/development/python-modules/sgp4/default.nix +++ b/pkgs/development/python-modules/sgp4/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sgp4"; - version = "2.22"; + version = "2.23"; src = fetchPypi { inherit pname version; - hash = "sha256-F/Ci6q0tygZbbeJcHOqpQP98+ozGcSDLQRGgDxd7hvk="; + hash = "sha256-2K3cU6L7n4je5r/UAdKGWwFMwLV78s7mm97o2WhdVCk="; }; nativeCheckInputs = [ numpy ]; -- cgit 1.4.1 From d43e8d5549d4991d7b875a4cfb7c09e9bb6901d2 Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Sun, 12 Nov 2023 09:31:39 +0000 Subject: Update doc/languages-frameworks/rust.section.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jörg Thalheim --- doc/languages-frameworks/rust.section.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index a2d132a2050..d18b048b911 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -939,6 +939,7 @@ Fenix also has examples with `buildRustPackage`, [crane](https://github.com/ipetkov/crane), [naersk](https://github.com/nix-community/naersk), and cross compilation in its [Examples](https://github.com/nix-community/fenix#examples) section. + ## Using `git bisect` on the Rust compiler {#using-git-bisect-on-the-rust-compiler} Sometimes an upgrade of the Rust compiler (`rustc`) will break a -- cgit 1.4.1 From 1155b21e5d3eab45dfd53829dd259631ad4461c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Nov 2023 13:40:18 +0100 Subject: python310Packages.unicodedata2: add changelog to meta --- pkgs/development/python-modules/unicodedata2/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix index 73e34f6ee44..7a9d4d3fc64 100644 --- a/pkgs/development/python-modules/unicodedata2/default.nix +++ b/pkgs/development/python-modules/unicodedata2/default.nix @@ -16,7 +16,8 @@ buildPythonPackage rec { meta = with lib; { description = "Backport and updates for the unicodedata module"; homepage = "https://github.com/mikekap/unicodedata2"; + changelog = "https://github.com/fonttools/unicodedata2/releases/tag/${version}"; license = licenses.asl20; - maintainers = [ maintainers.sternenseemann ]; + maintainers = with maintainers; [ sternenseemann ]; }; } -- cgit 1.4.1 From a4fc57190fc8bd5afe988681d7bdad5aec414c1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Nov 2023 13:41:56 +0100 Subject: python310Packages.unicodedata2: modernize --- pkgs/development/python-modules/unicodedata2/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix index 7a9d4d3fc64..25dcbd7c37f 100644 --- a/pkgs/development/python-modules/unicodedata2/default.nix +++ b/pkgs/development/python-modules/unicodedata2/default.nix @@ -1,17 +1,25 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, isPy27 }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "unicodedata2"; version = "15.1.0"; + format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - sha256 = "sha256-yzDxia1mSC+FKaRdpxsqiEHpvSuzdswpMwA6SlWgdkg="; + hash = "sha256-yzDxia1mSC+FKaRdpxsqiEHpvSuzdswpMwA6SlWgdkg="; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Backport and updates for the unicodedata module"; -- cgit 1.4.1 From 1af710178701f68e91f40555f5bcb89ac257907f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Nov 2023 13:43:24 +0100 Subject: python310Packages.unicodedata2: add pythonImportsCheck --- pkgs/development/python-modules/unicodedata2/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix index 25dcbd7c37f..972aa3093a8 100644 --- a/pkgs/development/python-modules/unicodedata2/default.nix +++ b/pkgs/development/python-modules/unicodedata2/default.nix @@ -21,6 +21,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ + "unicodedata2" + ]; + meta = with lib; { description = "Backport and updates for the unicodedata module"; homepage = "https://github.com/mikekap/unicodedata2"; -- cgit 1.4.1 From 2c3bc3025709ad9e409433ad68f39f2bb9125fac Mon Sep 17 00:00:00 2001 From: lunik1 Date: Sun, 12 Nov 2023 13:25:17 +0000 Subject: iosevka: 27.3.4 -> 27.3.5 Diff: https://github.com/be5invis/iosevka/compare/v27.3.4...v27.3.5 --- pkgs/data/fonts/iosevka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 1d7ed664097..04f89b6d2a1 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "27.3.4"; + version = "27.3.5"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-JsK2jzXyAACh9e3P2y0YLky2XQuR/dKyEbRpFUSnJdM="; + hash = "sha256-dqXr/MVOuEmAMueaRWsnzY9MabhnyBRtLR9IDVLN79I="; }; - npmDepsHash = "sha256-uchJ+1NWbo4FpNOjOO3luhIdZyQZLToZ1UCMLdGzjkY="; + npmDepsHash = "sha256-bux8aFBP1Pi5pAQY1jkNTqD2Ny2j+QQs+QRaXWJj6xg="; nativeBuildInputs = [ remarshal -- cgit 1.4.1 From de6cb9794525a0f3fcc6010b51c81d4205380153 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Nov 2023 16:25:33 +0000 Subject: python311Packages.asyncssh: 2.14.0 -> 2.14.1 --- pkgs/development/python-modules/asyncssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 663c71b926e..f499adc7bb1 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.14.0"; + version = "2.14.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-4D7y0TH7tDcbQBhxhFLOjHNaSO3+ATnSq9zkwYekWcM="; + hash = "sha256-GsMcMzoNg8iIMVIyRVAMqoFFA0I3QbDkZTOe9tpbXik="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From ef3119e3cd8f019cf0ef2dffd8c7268b696a099e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Nov 2023 16:45:05 +0000 Subject: python311Packages.awscrt: 0.19.8 -> 0.19.12 --- pkgs/development/python-modules/awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 36f282fe1e4..0927fba08e5 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.19.8"; + version = "0.19.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d6I1nRL41sWFvv9Nxw5dSJDEv15i9Lni0wySyWruEGU="; + hash = "sha256-skkkwtmSbGJV6MRBJMfNhu+pWEBuMkB7ozTh9wiyYVM="; }; buildInputs = lib.optionals stdenv.isDarwin [ -- cgit 1.4.1 From d0fa6f67f799f956be26bdff1c9904febba356e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Nov 2023 16:45:21 +0000 Subject: python311Packages.azure-eventgrid: 4.15.0 -> 4.16.0 --- pkgs/development/python-modules/azure-eventgrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index 07914459837..4d9c50bb059 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-eventgrid"; - version = "4.15.0"; + version = "4.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hVPCQgVu5NkEMJBJcfaER8JGtjnIEWquIcBX6vFSiAc="; + hash = "sha256-o895Xjp/su2mc1WHbsQvWDe28sX/HhLtOb7BC5TFkyg="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 9ac9ea24583f4e5aaa0f42d4f86a99c3726af7b5 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 8 Nov 2023 10:43:23 +0100 Subject: python3Packages.django-crispy-bootstrap4: init at 2023.1 --- .../django-crispy-bootstrap4/default.nix | 42 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/django-crispy-bootstrap4/default.nix diff --git a/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix b/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix new file mode 100644 index 00000000000..d8bb73ccdef --- /dev/null +++ b/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, setuptools +, pytestCheckHook +, pytest-django +, django-crispy-forms +}: + +buildPythonPackage rec { + pname = "django-crispy-bootstrap4"; + version = "2023.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "django-crispy-forms"; + repo = "crispy-bootstrap4"; + rev = "refs/tags/${version}"; + hash = "sha256-4p6dlyQYZGyfBntTuzCjikL8ZG/4xDnTiQ1rCVt0Hbk="; + }; + + propagatedBuildInputs = [ + django + setuptools + ]; + + nativeCheckInputs = [ + pytest-django + pytestCheckHook + django-crispy-forms + ]; + + pythonImportsCheck = [ "crispy_bootstrap4" ]; + + meta = with lib; { + description = "Bootstrap 4 template pack for django-crispy-forms"; + homepage = "https://github.com/django-crispy-forms/crispy-bootstrap4"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0562fbf3b0e..f0502b4eeb5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2958,6 +2958,8 @@ self: super: with self; { django-countries = callPackage ../development/python-modules/django-countries { }; + django-crispy-bootstrap4 = callPackage ../development/python-modules/django-crispy-bootstrap4 { }; + django-crispy-forms = callPackage ../development/python-modules/django-crispy-forms { }; django-cryptography = callPackage ../development/python-modules/django-cryptography { }; -- cgit 1.4.1 From 9260272fa0c1778559fe8db0113bf44118d62307 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 12 Nov 2023 20:45:54 +0100 Subject: python310Packages.flask-login: 0.6.2 -> 0.6.3 https://github.com/maxcountryman/flask-login/blob/0.6.3/CHANGES.md --- .../python-modules/flask-login/default.nix | 51 ++++++++++------------ 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index 1caf53c7a2d..134dc8f2e44 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -1,34 +1,48 @@ { lib -, asgiref -, blinker , buildPythonPackage , fetchPypi +, pythonOlder + +# build-system +, setuptools + +# dependencies , flask +, werkzeug + +# tests +, asgiref +, blinker , pytestCheckHook -, pythonAtLeast -, pythonOlder , semantic-version -, werkzeug }: buildPythonPackage rec { pname = "flask-login"; - version = "0.6.2"; - format = "setuptools"; + version = "0.6.3"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Flask-Login"; inherit version; - hash = "sha256-wKe6qf3ESM3T3W8JOd9y7sUXey96vmy4L8k00pyqycM="; + hash = "sha256-XiPRSmB+8SgGxplZC4nQ8ODWe67sWZ11lHv5wUczAzM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ flask werkzeug ]; + pythonImportsCheck = [ + "flask_login" + ]; + nativeCheckInputs = [ asgiref blinker @@ -36,25 +50,8 @@ buildPythonPackage rec { semantic-version ]; - disabledTests = [ - # https://github.com/maxcountryman/flask-login/issues/747 - "test_remember_me_accepts_duration_as_int" - "test_remember_me_custom_duration_uses_custom_cookie" - "test_remember_me_refresh_every_request" - "test_remember_me_uses_custom_cookie_parameters" - ] ++ lib.optionals (pythonAtLeast "3.10") [ - "test_hashable" - ]; - - pytestFlagsArray = [ - "-W" "ignore::DeprecationWarning" - ]; - - pythonImportsCheck = [ - "flask_login" - ]; - meta = with lib; { + changelog = "https://github.com/maxcountryman/flask-login/blob/${version}/CHANGES.md"; description = "User session management for Flask"; homepage = "https://github.com/maxcountryman/flask-login"; license = licenses.mit; -- cgit 1.4.1 From 70ccb0dec2983e576833de94fe35081dd5d60b5b Mon Sep 17 00:00:00 2001 From: Maurice <16151097+tu-maurice@users.noreply.github.com> Date: Sun, 12 Nov 2023 20:48:23 +0100 Subject: python311Packages.pydantic-settings: mark broken (#267088) python311Packages.pydantic-settings: mark broken It was packaged for pydantic 2.0, which was then reverted due to too many regressions. Keep the package, but mark it broken until our pydantic version catches up. --- pkgs/development/python-modules/pydantic-settings/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pydantic-settings/default.nix b/pkgs/development/python-modules/pydantic-settings/default.nix index a375ded35f0..c27bb5f2757 100644 --- a/pkgs/development/python-modules/pydantic-settings/default.nix +++ b/pkgs/development/python-modules/pydantic-settings/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { description = "Settings management using pydantic"; homepage = "https://github.com/pydantic/pydantic-settings"; license = licenses.mit; + broken = lib.versionOlder pydantic.version "2.0.0"; maintainers = with maintainers; [ ]; }; } -- cgit 1.4.1 From 5fa6b40311ca7bf45d9290c39001fdc8d59f8f31 Mon Sep 17 00:00:00 2001 From: Corey O'Connor Date: Sun, 15 Oct 2023 10:05:42 -0700 Subject: gnome.gnome-control-center: fix crash in Mouse panel The Mouse panel uses GtkPicture to display VP9-encoded webm clips. Without GStreamer, the panel would crash with: ERROR: GstPlay: 'playbin' element not found, please check your setup Fixes: https://github.com/NixOS/nixpkgs/issues/253928 --- pkgs/desktops/gnome/core/gnome-control-center/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index e9fd74c9222..f266c480913 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -23,6 +23,7 @@ , gnome , gsettings-desktop-schemas , gsound +, gst_all_1 , gtk4 , ibus , libgnomekbd @@ -134,7 +135,11 @@ stdenv.mkDerivation rec { tracker-miners # for search locations dialog udisks2 upower - ]; + ] ++ (with gst_all_1; [ + # For animations in Mouse panel. + gst-plugins-base + gst-plugins-good + ]); preConfigure = '' # For ITS rules -- cgit 1.4.1 From 10d9b249b1a1f726c5041663dfb38dd1abe172c7 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 11 Nov 2023 20:18:29 -0300 Subject: gnu-smalltalk: adopted by AndersonTorres --- pkgs/development/compilers/gnu-smalltalk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index 834a30b3716..1caf96c715c 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -55,6 +55,6 @@ in stdenv.mkDerivation rec { homepage = "http://smalltalk.gnu.org/"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ AndersonTorres ]; }; } -- cgit 1.4.1 From 029c9804509f0a746e71a60646f1c40cb5ff726c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 11 Nov 2023 20:23:00 -0300 Subject: libtcod: adopted by AndersonTorres --- pkgs/development/libraries/libtcod/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index 636b3ac2b0f..3674f25b465 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation { homepage = "http://roguecentral.org/doryen/libtcod/"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; - maintainers = [ ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; }; } -- cgit 1.4.1 From 84c5ad5cd56255783be58476f33a0c05efc83ae8 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 11 Nov 2023 20:19:39 -0300 Subject: paperkey: adopted by AndersonTorres and peterhoeg --- pkgs/tools/security/paperkey/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix index 30aecae7339..8e86415cb9e 100644 --- a/pkgs/tools/security/paperkey/default.nix +++ b/pkgs/tools/security/paperkey/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://www.jabberwocky.com/software/paperkey/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ AndersonTorres peterhoeg ]; }; } -- cgit 1.4.1 From bcec59d388da1d8438439a29fc3f5401d4096698 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 11 Nov 2023 20:26:11 -0300 Subject: brogue: adopted by AndersonTorres and fgaz --- pkgs/games/brogue/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index d7f5694bfb6..0cd3e779c56 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "A roguelike game"; homepage = "https://sites.google.com/site/broguegame/"; license = licenses.agpl3; - maintainers = [ ]; + maintainers = with maintainers; [ AndersonTorres fgaz ]; platforms = [ "x86_64-linux" ]; }; } -- cgit 1.4.1 From f8bd787134a22e626d663d7cc57792d450e67189 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 11 Nov 2023 20:26:26 -0300 Subject: brogue-ce: add AndersonTorres as maintainer Because I am already a mantainer for Brogue Classic. --- pkgs/games/brogue-ce/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/brogue-ce/default.nix b/pkgs/games/brogue-ce/default.nix index 7532be8d195..77e58ed5a1a 100644 --- a/pkgs/games/brogue-ce/default.nix +++ b/pkgs/games/brogue-ce/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "A community-lead fork of the minimalist roguelike game Brogue"; homepage = "https://github.com/tmewett/BrogueCE"; license = licenses.agpl3; - maintainers = with maintainers; [ fgaz ]; + maintainers = with maintainers; [ AndersonTorres fgaz ]; platforms = platforms.all; }; } -- cgit 1.4.1