diff options
18 files changed, 132 insertions, 48 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 389b660ab4fc..263a1b4437e9 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -10,7 +10,7 @@ In addition to numerous new and upgraded packages, this release has the followin - `screen`'s module has been cleaned, and will now require you to set `programs.screen.enable` in order to populate `screenrc` and add the program to the environment. -- `linuxPackages_testing_bcachefs` is now fully deprecated by `linuxPackages_testing`, and is therefore no longer available. +- `linuxPackages_testing_bcachefs` is now fully deprecated by `linuxPackages_latest`, and is therefore no longer available. - NixOS now installs a stub ELF loader that prints an informative error message when users attempt to run binaries not made for NixOS. - This can be disabled through the `environment.stub-ld.enable` option. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 815061639c69..fa9ca2225530 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -195,7 +195,6 @@ ./programs/haguichi.nix ./programs/hamster.nix ./programs/htop.nix - ./programs/hyprland.nix ./programs/iay.nix ./programs/iftop.nix ./programs/i3lock.nix @@ -273,6 +272,7 @@ ./programs/wavemon.nix ./programs/wayland/cardboard.nix ./programs/wayland/labwc.nix + ./programs/wayland/hyprland.nix ./programs/wayland/river.nix ./programs/wayland/sway.nix ./programs/wayland/waybar.nix diff --git a/nixos/modules/programs/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix index 9061ce5da83a..9061ce5da83a 100644 --- a/nixos/modules/programs/hyprland.nix +++ b/nixos/modules/programs/wayland/hyprland.nix diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 086e5d65da2f..59cf1a47fb7f 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -86,9 +86,14 @@ touch /etc/initrd-release # Function for waiting for device(s) to appear. waitDevice() { local device="$1" - # Split device string using ':' as a delimiter as bcachefs - # uses this for multi-device filesystems, i.e. /dev/sda1:/dev/sda2:/dev/sda3 - local IFS=':' + # Split device string using ':' as a delimiter, bcachefs uses + # this for multi-device filesystems, i.e. /dev/sda1:/dev/sda2:/dev/sda3 + local IFS + + # bcachefs is the only known use for this at the moment + # Preferably, the 'UUID=' syntax should be enforced, but + # this is kept for compatibility reasons + if [ "$fsType" = bcachefs ]; then IFS=':'; fi # USB storage devices tend to appear with some delay. It would be # great if we had a way to synchronously wait for them, but diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index fdb149a3d9a1..3b990ce30b21 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -123,9 +123,14 @@ in inherit assertions; # needed for systemd-remount-fs system.fsPackages = [ pkgs.bcachefs-tools ]; - # FIXME: Remove this line when the default kernel has bcachefs + # FIXME: Remove this line when the LTS (default) kernel is at least version 6.7 boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; - systemd.services = lib.mapAttrs' (mkUnits "") (lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems); + services.udev.packages = [ pkgs.bcachefs-tools ]; + + systemd = { + packages = [ pkgs.bcachefs-tools ]; + services = lib.mapAttrs' (mkUnits "") (lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems); + }; } (lib.mkIf ((lib.elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) { diff --git a/pkgs/applications/misc/nwg-displays/default.nix b/pkgs/applications/misc/nwg-displays/default.nix index f9f6ad429924..804198d5a641 100644 --- a/pkgs/applications/misc/nwg-displays/default.nix +++ b/pkgs/applications/misc/nwg-displays/default.nix @@ -14,13 +14,13 @@ python310Packages.buildPythonApplication rec { pname = "nwg-displays"; - version = "0.3.10"; + version = "0.3.12"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-displays"; - rev = "v${version}"; - hash = "sha256-clL34Ewzf0sJEWiye4L4e1RrPFIHkmotLpPaibGvVY4="; + rev = "refs/tags/v${version}"; + hash = "sha256-cr+2ejpXEOg0e86tT37o9400J299DQSkOrQUZE5+V2s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index d5779abc2c6b..46307a133de3 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -9,6 +9,8 @@ , qtsvg , qttools , qtserialport +, qtwayland +, qt5compat , boost , libngspice , libgit2 @@ -18,38 +20,60 @@ let # SHA256 of the fritzing-parts HEAD on the master branch, # which contains the latest stable parts definitions - partsSha = "4713511c894cb2894eae505b9307c6555afcc32c"; + partsSha = "015626e6cafb1fc7831c2e536d97ca2275a83d32"; parts = fetchFromGitHub { owner = "fritzing"; repo = "fritzing-parts"; rev = partsSha; - sha256 = "sha256-QiOGWc+99MJhOVrXyNOinR8rTVvW/E+wPfoB6QvbhY0="; + hash = "sha256-5jw56cqxpT/8bf1q551WG53J6Lw5pH0HEtRUoNNMc+A="; + }; + + # Header-only library + svgpp = fetchFromGitHub { + owner = "svgpp"; + repo = "svgpp"; + rev = "v1.3.0"; + hash = "sha256-kJEVnMYnDF7bThDB60bGXalYgpn9c5/JCZkRSK5GoE4="; }; in stdenv.mkDerivation rec { pname = "fritzing"; - version = "unstable-2022-07-01"; + version = "1.0.1"; src = fetchFromGitHub { owner = pname; repo = "fritzing-app"; - rev = "40d23c29b0463d5c968c3c4b34ed5ffc05c5a258"; - sha256 = "sha256-smvfuxQWF/LMFFXHOKb3zUZsEet/XoiaxXOR5QMaYzw="; + rev = "8f5f1373835050ce014299c78d91c24beea9b633"; + hash = "sha256-jLVNzSh2KwXpi3begtp/53sdBmQQbCnKMCm2p770etg="; }; - buildInputs = [ qtbase qtsvg qtserialport boost libgit2 quazip libngspice ]; - nativeBuildInputs = [ qmake pkg-config qttools wrapQtAppsHook ]; - patches = [ + # Fix error caused by implicit call (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-Quick-Dirty-patch-to-allow-finding-quazip-qt5-on-Arc.patch?h=fritzing&id=1ae0dc88464f375a54b156e6761315bcb04bcc1f"; - sha256 = "sha256-iS18EWw920gyeXDoHBRGwXvwMJurJS21H77Erl+fqog="; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0003-ParseResult-operator-bool-in-explicit.patch?h=fritzing&id=b2c79b55f0a2811e80bb1136b1e021fbc56937c9"; + hash = "sha256-9HdcNqLHEB0HQbF7AaTdUIJUbafwsRKPA+wfF4g8veU="; }) ]; + nativeBuildInputs = [ qmake pkg-config qttools wrapQtAppsHook ]; + buildInputs = [ + qtbase + qtsvg + qtserialport + qtwayland + qt5compat + boost + libgit2 + quazip + libngspice + ]; + postPatch = '' + # Use packaged quazip, libgit and ngspice + sed -i "/pri\/quazipdetect.pri/d" phoenix.pro + sed -i "/pri\/spicedetect.pri/d" phoenix.pro substituteInPlace phoenix.pro \ --replace 'LIBGIT_STATIC = true' 'LIBGIT_STATIC = false' @@ -61,7 +85,11 @@ stdenv.mkDerivation rec { cp -a ${parts}/* parts/ ''; - env.NIX_CFLAGS_COMPILE = "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip"; + env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ + "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip" + "-I${svgpp}/include" + ]; + env.NIX_LDFLAGS = "-lquazip1-qt${lib.versions.major qtbase.version}"; qmakeFlags = [ "phoenix.pro" diff --git a/pkgs/by-name/su/sudachi-rs/package.nix b/pkgs/by-name/su/sudachi-rs/package.nix index f55a24e41e79..24ae7a9873e8 100644 --- a/pkgs/by-name/su/sudachi-rs/package.nix +++ b/pkgs/by-name/su/sudachi-rs/package.nix @@ -4,17 +4,18 @@ , sudachidict , runCommand , sudachi-rs +, writeScript }: rustPlatform.buildRustPackage rec { pname = "sudachi-rs"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "WorksApplications"; repo = "sudachi.rs"; rev = "refs/tags/v${version}"; - hash = "sha256-VzNOI6PP9sKBsNfB5yIxAI8jI8TEdM4tD49Jl/2tkSE="; + hash = "sha256-9GXU+YDPuQ+roqQfUE5q17Hl6AopsvGhRPjZ+Ui+n24="; }; postPatch = '' @@ -22,7 +23,7 @@ rustPlatform.buildRustPackage rec { --replace '"resources"' '"${placeholder "out"}/share/resources"' ''; - cargoHash = "sha256-b2NtgHcMkimzFFuqohAo9KdSaIq6oi3qo/k8/VugyFs="; + cargoHash = "sha256-Ufo3dB2KGDDNiebp7hLhQrUMLsefO8wRpJQDz57Yb8Y="; # prepare the resources before the build so that the binary can find sudachidict preBuild = '' @@ -30,12 +31,22 @@ rustPlatform.buildRustPackage rec { install -Dm644 resources/* -t $out/share/resources ''; - passthru.tests = { - # detects an error that sudachidict is not found - cli = runCommand "${pname}-cli-test" { } '' - mkdir $out - echo "高輪ゲートウェイ駅" | ${lib.getExe sudachi-rs} > $out/result + passthru = { + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p nix-update + + set -eu -o pipefail + nix-update sudachi-rs + nix-update --version=skip python3Packages.sudachipy ''; + tests = { + # detects an error that sudachidict is not found + cli = runCommand "${pname}-cli-test" { } '' + mkdir $out + echo "高輪ゲートウェイ駅" | ${lib.getExe sudachi-rs} > $out/result + ''; + }; }; meta = with lib; { diff --git a/pkgs/by-name/sw/swaylock-fancy/package.nix b/pkgs/by-name/sw/swaylock-fancy/package.nix index 83d56def4dcc..d821863e84a7 100644 --- a/pkgs/by-name/sw/swaylock-fancy/package.nix +++ b/pkgs/by-name/sw/swaylock-fancy/package.nix @@ -31,13 +31,13 @@ in stdenv.mkDerivation { pname = "swaylock-fancy"; - version = "unstable-2023-11-21"; + version = "unstable-2023-12-22"; src = fetchFromGitHub { owner = "Big-B"; repo = "swaylock-fancy"; - rev = "ff37ae3c6d0f100f81ff64fdb9d422c37de2f4f6"; - hash = "sha256-oS4YCbZOIrMP4QSM5eHWzTn18k3w2OnJ2k+64x/DnuM="; + rev = "0b93740e1dfc39883c125c212a1adc16b01c14f1"; + hash = "sha256-ko4SeHGNBiPMvxFXhD+U2r0Mwc14C2IN5CaJYI0V8u8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sudachidict/default.nix b/pkgs/development/python-modules/sudachidict/default.nix index 72826908612c..41a359110474 100644 --- a/pkgs/development/python-modules/sudachidict/default.nix +++ b/pkgs/development/python-modules/sudachidict/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , sudachidict , setuptools +, sudachipy }: buildPythonPackage rec { @@ -33,6 +34,10 @@ buildPythonPackage rec { setuptools ]; + propagatedBuildInputs = [ + sudachipy + ]; + # we need to prepare some files before the build # https://github.com/WorksApplications/SudachiDict/blob/develop/package_python.sh preBuild = '' diff --git a/pkgs/development/python-modules/sudachipy/default.nix b/pkgs/development/python-modules/sudachipy/default.nix index bfaf9be85846..3e3bd5b4adf6 100644 --- a/pkgs/development/python-modules/sudachipy/default.nix +++ b/pkgs/development/python-modules/sudachipy/default.nix @@ -10,6 +10,7 @@ , pytestCheckHook , sudachidict-core , tokenizers +, sudachipy }: buildPythonPackage rec { @@ -19,7 +20,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Am+ae2lgnndSDzf0GF8R1i6OPLdIlm2dLThqYqXbscA="; + hash = "sha256-ARwvThfATDdzBTjPFr9yjbE/0eYvp/TCZOEGbUupJmU="; }; nativeBuildInputs = [ @@ -37,6 +38,9 @@ buildPythonPackage rec { cd python ''; + # avoid infinite recursion due to sudachidict + doCheck = false; + nativeCheckInputs = [ pytestCheckHook sudachidict-core @@ -47,6 +51,20 @@ buildPythonPackage rec { "sudachipy" ]; + passthru = { + inherit (sudachi-rs) updateScript; + tests = { + pytest = sudachipy.overridePythonAttrs ( + _: { + doCheck = true; + # avoid catchConflicts of sudachipy + # we don't need to install this package since it is just a test + dontInstall = true; + } + ); + }; + }; + meta = sudachi-rs.meta // { homepage = "https://github.com/WorksApplications/sudachi.rs/tree/develop/python"; mainProgram = "sudachipy"; diff --git a/pkgs/development/tools/kdash/default.nix b/pkgs/development/tools/kdash/default.nix index 7e529337e5d9..c7f4e8b7525f 100644 --- a/pkgs/development/tools/kdash/default.nix +++ b/pkgs/development/tools/kdash/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "kdash"; - version = "0.4.7"; + version = "0.5.0"; src = fetchFromGitHub { owner = "kdash-rs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KQ1SLnXtox/bIV32guEfC2LSt8LDWGSG5b9i0gqS2Yc="; + sha256 = "sha256-Vk0Pf5uF9AANv/vf32ZrICJJTp6QRsR/nFW40xnkImo="; }; nativeBuildInputs = [ perl python3 pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl xorg.xcbutil ] ++ lib.optional stdenv.isDarwin AppKit; - cargoHash = "sha256-bgS93o654xDVz2OMFy1mwxCKQESV8MPZ4Mjb0IdypLU="; + cargoHash = "sha256-gY4ywjTokEc5Uv4InARH2s3WYiPGYSDDWk2kltyQa+0="; meta = with lib; { description = "A simple and fast dashboard for Kubernetes"; diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 6dd9eb589631..5c0d0f7ddf39 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec { zstd ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index 903022c6f876..139ea6c7f068 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.28"; + version = "0.2.29"; src = fetchCrate { inherit pname version; - hash = "sha256-DZKl3FRgBzrgKDl/eVOFRW2jZXT8ul+ZgZbBxZcmgss="; + hash = "sha256-9Q+BnzgoD95eKkMZrQF6+khbx5wqnER83PK3vbRrRv8="; }; - cargoHash = "sha256-QaRqrd4wHuMfAYy/vqkwdoWB1BDGx0YyjvFNqjSOM2I="; + cargoHash = "sha256-cyFAilqpaO6TDtJUmweUHYEpWxUAhHDYgCUGSz5EBFU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 17b438ac46b8..f45e4b51953f 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -19,6 +19,7 @@ , rustPlatform , makeWrapper , writeScript +, python3 , fuseSupport ? false }: @@ -26,7 +27,6 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; version = "1.4.1"; - src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; @@ -65,12 +65,12 @@ stdenv.mkDerivation (finalAttrs: { udev ] ++ lib.optional fuseSupport fuse3; + # FIXME: Try enabling this once the default linux kernel is at least 6.7 doCheck = false; # needs bcachefs module loaded on builder checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ]; makeFlags = [ - "DESTDIR=${placeholder "out"}" - "PREFIX=" + "PREFIX=${placeholder "out"}" "VERSION=${finalAttrs.version}" "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ]; @@ -79,6 +79,17 @@ stdenv.mkDerivation (finalAttrs: { rm tests/test_fuse.py ''; + # Tries to install to the 'systemd-minimal' and 'udev' nix installation paths + installFlags = [ + "PKGCONFIG_SERVICEDIR=$(out)/lib/systemd/system" + "PKGCONFIG_UDEVDIR=$(out)/lib/udev" + ]; + + postInstall = '' + substituteInPlace $out/libexec/bcachefsck_all \ + --replace "/usr/bin/python3" "${python3}/bin/python3" + ''; + passthru = { tests = { smoke-test = nixosTests.bcachefs; diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index b8f1b00b844d..7395bffd8458 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -32,14 +32,14 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.12.1"; + version = "2.12.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-OaKroZmGyUWnm/WEw3dSheJOnH+O2KYDgVthxfrF20w="; + hash = "sha256-s8pKsQetZbV/4TEuQ2Dh97PXxe2BqEG27Uizd3hi7Vc="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0b190ebb9a62..a859b7e861e1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -616,9 +616,9 @@ mapAliases ({ ''; linux_latest_hardened = linuxPackages_latest_hardened; - # Added 2023-11-18 - linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_testing', or any other linux kernel with bcachefs support"; - linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_testing', or any other linux kernel with bcachefs support"; + # Added 2023-11-18, modified 2024-01-09 + linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; + linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; lld_6 = throw "lld_6 has been removed from nixpkgs"; # Added 2024-01-08 lld_7 = throw "lld_7 has been removed from nixpkgs"; # Added 2023-11-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bafaef62e00..66db08ac74b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31575,7 +31575,7 @@ with pkgs; freewheeling = callPackage ../applications/audio/freewheeling { }; - fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; + fritzing = qt6Packages.callPackage ../applications/science/electronics/fritzing { }; fsv = callPackage ../applications/misc/fsv { }; |