diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index da13f66838ce..399bff49f69f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2477,6 +2477,12 @@ githubId = 50839; name = "Brian Jones"; }; + boltzmannrain = { + email = "boltzmannrain@gmail.com"; + github = "boltzmannrain"; + githubId = 150560585; + name = "Dmitry Ivankov"; + }; booklearner = { name = "booklearner"; email = "booklearner@proton.me"; @@ -2682,6 +2688,12 @@ githubId = 61636; name = "Brad Langhorst"; }; + bycEEE = { + email = "bycEEE@gmail.com"; + github = "bycEEE"; + githubId = 8891115; + name = "Brian Choy"; + }; bzizou = { email = "Bruno@bzizou.net"; github = "bzizou"; @@ -7793,6 +7805,12 @@ githubId = 4458; name = "Ivan Kozik"; }; + ivan770 = { + email = "ivan@ivan770.me"; + github = "ivan770"; + githubId = 14003886; + name = "Ivan Leshchenko"; + }; ivan-babrou = { email = "nixpkgs@ivan.computer"; name = "Ivan Babrou"; @@ -10968,6 +10986,12 @@ githubId = 1651325; name = "maralorn"; }; + marcovergueira = { + email = "vergueira.marco@gmail.com"; + github = "marcovergueira"; + githubId = 929114; + name = "Marco Vergueira"; + }; marcus7070 = { email = "marcus@geosol.com.au"; github = "marcus7070"; @@ -14041,6 +14065,12 @@ githubId = 301903; name = "Chip Collier"; }; + phrogg = { + name = "Phil Roggenbuck"; + email = "nixpkgs@phrogg.de"; + github = "phrogg"; + githubId = 1367949; + }; phryneas = { email = "mail@lenzw.de"; github = "phryneas"; @@ -14810,6 +14840,12 @@ githubId = 1016742; name = "Rafael García"; }; + rafaelrc = { + email = "contact@rafaelrc.com"; + name = "Rafael Carvalho"; + github = "rafaelrc7"; + githubId = 5376043; + }; ragge = { email = "r.dahlen@gmail.com"; github = "ragnard"; diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index d12695e20dea..e2853569423d 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -30,6 +30,9 @@ [`sudo-rs`]: https://github.com/memorysafety/sudo-rs/ +- `linuxPackages_testing_bcachefs` is now soft-deprecated by `linuxPackages_testing`. + - Please consider changing your NixOS configuration's `boot.kernelPackages` to `linuxPackages_testing` until a stable kernel with bcachefs support is released. + - All [ROCm](https://rocm.docs.amd.com/en/latest/) packages have been updated to 5.7.0. - [ROCm](https://rocm.docs.amd.com/en/latest/) package attribute sets are versioned: `rocmPackages` -> `rocmPackages_5`. diff --git a/nixos/lib/systemd-network-units.nix b/nixos/lib/systemd-network-units.nix index 8bda1a8bfdcf..1d5f823f3678 100644 --- a/nixos/lib/systemd-network-units.nix +++ b/nixos/lib/systemd-network-units.nix @@ -23,6 +23,12 @@ in { '' + optionalString (def.vlanConfig != { }) '' [VLAN] ${attrsToSection def.vlanConfig} + '' + optionalString (def.ipvlanConfig != { }) '' + [IPVLAN] + ${attrsToSection def.ipvlanConfig} + '' + optionalString (def.ipvtapConfig != { }) '' + [IPVTAP] + ${attrsToSection def.ipvtapConfig} '' + optionalString (def.macvlanConfig != { }) '' [MACVLAN] ${attrsToSection def.macvlanConfig} diff --git a/nixos/modules/services/misc/forgejo.md b/nixos/modules/services/misc/forgejo.md index 6a3407382085..3df8bc20976a 100644 --- a/nixos/modules/services/misc/forgejo.md +++ b/nixos/modules/services/misc/forgejo.md @@ -68,7 +68,7 @@ services.forgejo = { database.user = "gitea"; }; -users.users,gitea = { +users.users.gitea = { home = "/var/lib/gitea"; useDefaultShell = true; group = "gitea"; diff --git a/nixos/modules/services/misc/forgejo.nix b/nixos/modules/services/misc/forgejo.nix index 15966adfe38e..454febda5893 100644 --- a/nixos/modules/services/misc/forgejo.nix +++ b/nixos/modules/services/misc/forgejo.nix @@ -436,17 +436,6 @@ in ]; }; - # Work around 'pq: permission denied for schema public' with postgres v15, until a - # solution for `services.postgresql.ensureUsers` is found. - # See https://github.com/NixOS/nixpkgs/issues/216989 - systemd.services.postgresql.postStart = lib.mkIf ( - usePostgresql - && cfg.database.createDatabase - && lib.strings.versionAtLeast config.services.postgresql.package.version "15.0" - ) (lib.mkAfter '' - $PSQL -tAc 'ALTER DATABASE "${cfg.database.name}" OWNER TO "${cfg.database.user}";' - ''); - services.mysql = optionalAttrs (useMysql && cfg.database.createDatabase) { enable = mkDefault true; package = mkDefault pkgs.mariadb; diff --git a/nixos/modules/services/networking/mullvad-vpn.nix b/nixos/modules/services/networking/mullvad-vpn.nix index 99ffbf56ccb0..8c7d5237971f 100644 --- a/nixos/modules/services/networking/mullvad-vpn.nix +++ b/nixos/modules/services/networking/mullvad-vpn.nix @@ -65,7 +65,9 @@ with lib; pkgs.iproute2 # Needed for ping "/run/wrappers" - ]; + # See https://github.com/NixOS/nixpkgs/issues/262681 + ] ++ (lib.optional config.networking.resolvconf.enable + config.networking.resolvconf.package); startLimitBurst = 5; startLimitIntervalSec = 20; serviceConfig = { diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 7d06e0131d9d..e2e7ffe59dcd 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -277,7 +277,7 @@ def install_bootloader(args: argparse.Namespace) -> None: if installed_version < available_version: print("updating systemd-boot from %s to %s" % (installed_version, available_version)) - subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@", "update"]) + subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + bootctl_flags + ["update"]) os.makedirs("@efiSysMountPoint@/efi/nixos", exist_ok=True) os.makedirs("@efiSysMountPoint@/loader/entries", exist_ok=True) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index b7ced5b0d346..33261021480f 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -122,6 +122,16 @@ let (assertValueOneOf "PacketInfo" boolValues) (assertValueOneOf "VNetHeader" boolValues) ]; + + # See https://www.freedesktop.org/software/systemd/man/latest/systemd.netdev.html#%5BIPVTAP%5D%20Section%20Options + ipVlanVtapChecks = [ + (assertOnlyFields [ + "Mode" + "Flags" + ]) + (assertValueOneOf "Mode" ["L2" "L3" "L3S" ]) + (assertValueOneOf "Flags" ["private" "vepa" "bridge" ]) + ]; in { sectionNetdev = checkUnitConfig "Netdev" [ @@ -146,6 +156,7 @@ let "ip6gretap" "ipip" "ipvlan" + "ipvtap" "macvlan" "macvtap" "sit" @@ -191,6 +202,10 @@ let (assertValueOneOf "ReorderHeader" boolValues) ]; + sectionIPVLAN = checkUnitConfig "IPVLAN" ipVlanVtapChecks; + + sectionIPVTAP = checkUnitConfig "IPVTAP" ipVlanVtapChecks; + sectionMACVLAN = checkUnitConfig "MACVLAN" [ (assertOnlyFields [ "Mode" @@ -615,6 +630,7 @@ let "VRF" "VLAN" "IPVLAN" + "IPVTAP" "MACVLAN" "MACVTAP" "VXLAN" @@ -1277,6 +1293,7 @@ let "FirewallMark" "Wash" "SplitGSO" + "AckFilter" ]) (assertValueOneOf "AutoRateIngress" boolValues) (assertInt "OverheadBytes") @@ -1309,6 +1326,7 @@ let (assertRange "FirewallMark" 1 4294967295) (assertValueOneOf "Wash" boolValues) (assertValueOneOf "SplitGSO" boolValues) + (assertValueOneOf "AckFilter" (boolValues ++ ["aggressive"])) ]; sectionControlledDelay = checkUnitConfig "ControlledDelay" [ @@ -1623,6 +1641,26 @@ let ''; }; + ipvlanConfig = mkOption { + default = {}; + example = { Mode = "L2"; Flags = "private"; }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionIPVLAN; + description = lib.mdDoc '' + Each attribute in this set specifies an option in the `[IPVLAN]` section of the unit. + See {manpage}`systemd.netdev(5)` for details. + ''; + }; + + ipvtapConfig = mkOption { + default = {}; + example = { Mode = "L3"; Flags = "vepa"; }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionIPVTAP; + description = lib.mdDoc '' + Each attribute in this set specifies an option in the `[IPVTAP]` section of the unit. + See {manpage}`systemd.netdev(5)` for details. + ''; + }; + macvlanConfig = mkOption { default = {}; example = { Mode = "private"; }; diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index af7ba7aa6a0f..d144ce62dc27 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -1,10 +1,8 @@ { config, lib, pkgs, utils, ... }: -with lib; - let - bootFs = filterAttrs (n: fs: (fs.fsType == "bcachefs") && (utils.fsNeededForBoot fs)) config.fileSystems; + bootFs = lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (utils.fsNeededForBoot fs)) config.fileSystems; commonFunctions = '' prompt() { @@ -56,7 +54,7 @@ let # remove this adaptation when bcachefs implements mounting by filesystem uuid # also, implement automatic waiting for the constituent devices when that happens # bcachefs does not support mounting devices with colons in the path, ergo we don't (see #49671) - firstDevice = fs: head (splitString ":" fs.device); + firstDevice = fs: lib.head (lib.splitString ":" fs.device); openCommand = name: fs: '' tryUnlock ${name} ${firstDevice fs} @@ -90,22 +88,45 @@ let }; }; + assertions = [ + { + assertion = let + kernel = config.boot.kernelPackages.kernel; + in ( + kernel.kernelAtLeast "6.7" || ( + lib.elem (kernel.structuredExtraConfig.BCACHEFS_FS or null) [ + lib.kernel.module + lib.kernel.yes + lib.kernel.option.yes + ] + ) + ); + + message = "Linux 6.7-rc1 at minimum or a custom linux kernel with bcachefs support is required"; + } + ]; in { - config = mkIf (elem "bcachefs" config.boot.supportedFilesystems) (mkMerge [ + config = lib.mkIf (lib.elem "bcachefs" config.boot.supportedFilesystems) (lib.mkMerge [ { + inherit assertions; # needed for systemd-remount-fs system.fsPackages = [ pkgs.bcachefs-tools ]; - # use kernel package with bcachefs support until it's in mainline - # TODO replace with requireKernelConfig - boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs; + # FIXME: Replace this with `linuxPackages_testing` after NixOS 23.11 is released + # FIXME: Replace this with `linuxPackages_latest` when 6.7 is released, remove this line when the LTS version is at least 6.7 + boot.kernelPackages = lib.mkDefault ( + # FIXME: Remove warning after NixOS 23.11 is released + lib.warn "Please upgrade to Linux 6.7-rc1 or later: 'linuxPackages_testing_bcachefs' is deprecated. Use 'boot.kernelPackages = pkgs.linuxPackages_testing;' to silence this warning" + pkgs.linuxPackages_testing_bcachefs + ); systemd.services = lib.mapAttrs' (mkUnits "") (lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems); } - (mkIf ((elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) { + (lib.mkIf ((lib.elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) { + inherit assertions; # chacha20 and poly1305 are required only for decryption attempts boot.initrd.availableKernelModules = [ "bcachefs" "sha256" "chacha20" "poly1305" ]; boot.initrd.systemd.extraBin = { @@ -121,7 +142,7 @@ in $out/bin/bcachefs version ''; - boot.initrd.postDeviceCommands = lib.mkIf (!config.boot.initrd.systemd.enable) (commonFunctions + concatStrings (mapAttrsToList openCommand bootFs)); + boot.initrd.postDeviceCommands = lib.mkIf (!config.boot.initrd.systemd.enable) (commonFunctions + lib.concatStrings (lib.mapAttrsToList openCommand bootFs)); boot.initrd.systemd.services = lib.mapAttrs' (mkUnits "/sysroot") bootFs; }) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index dcdd1b59eef5..e4a18fd81d71 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -56,6 +56,11 @@ in efiInstallAsRemovable = true; }; + fileSystems."/boot" = mkIf cfg.efi { + device = "/dev/disk/by-label/ESP"; + fsType = "vfat"; + }; + system.build.googleComputeImage = import ../../lib/make-disk-image.nix { name = "google-compute-image"; postVM = '' diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 1baa4396424f..e9ec28749850 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -991,6 +991,68 @@ in { ''; }; + bcachefsLinuxTesting = makeInstallerTest "bcachefs-linux-testing" { + extraInstallerConfig = { + imports = [ no-zfs-module ]; + + boot = { + supportedFilesystems = [ "bcachefs" ]; + kernelPackages = pkgs.linuxPackages_testing; + }; + }; + + extraConfig = '' + boot.kernelPackages = pkgs.linuxPackages_testing; + ''; + + createPartitions = '' + machine.succeed( + "flock /dev/vda parted --script /dev/vda -- mklabel msdos" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100M 1024M" # swap + + " mkpart primary 1024M -1s", # / + "udevadm settle", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + "mkfs.bcachefs -L root /dev/vda3", + "mount -t bcachefs /dev/vda3 /mnt", + "mkfs.ext3 -L boot /dev/vda1", + "mkdir -p /mnt/boot", + "mount /dev/vda1 /mnt/boot", + ) + ''; + }; + + bcachefsUpgradeToLinuxTesting = makeInstallerTest "bcachefs-upgrade-to-linux-testing" { + extraInstallerConfig = { + imports = [ no-zfs-module ]; + boot.supportedFilesystems = [ "bcachefs" ]; + # We don't have network access in the VM, we need this for `nixos-install` + system.extraDependencies = [ pkgs.linux_testing ]; + }; + + extraConfig = '' + boot.kernelPackages = pkgs.linuxPackages_testing; + ''; + + createPartitions = '' + machine.succeed( + "flock /dev/vda parted --script /dev/vda -- mklabel msdos" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100M 1024M" # swap + + " mkpart primary 1024M -1s", # / + "udevadm settle", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + "mkfs.bcachefs -L root /dev/vda3", + "mount -t bcachefs /dev/vda3 /mnt", + "mkfs.ext3 -L boot /dev/vda1", + "mkdir -p /mnt/boot", + "mount /dev/vda1 /mnt/boot", + ) + ''; + }; + # Test using labels to identify volumes in grub simpleLabels = makeInstallerTest "simpleLabels" { createPartitions = '' diff --git a/pkgs/applications/audio/ledfx/default.nix b/pkgs/applications/audio/ledfx/default.nix index 004823ee52d7..d0cafaaf7f02 100644 --- a/pkgs/applications/audio/ledfx/default.nix +++ b/pkgs/applications/audio/ledfx/default.nix @@ -5,12 +5,12 @@ python3.pkgs.buildPythonPackage rec { pname = "ledfx"; - version = "2.0.69"; + version = "2.0.78"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-gkO6XYiPMkU/zRLvc0yd3jJXVcAgAkR1W1ELTSN461o="; + hash = "sha256-IalfA/nfQrnE90ycOnPEZ4A/L8rwi08ECNA/8YxeAgQ="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 84df7d5b0c27..ad67837b3892 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,20 +38,21 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.201.0"; + version = "1.201.0.2"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-Do2JPNZtoi7zbUnJomQAZ8zR/WPB6+G051xZWmeUBP4="; + hash = "sha256-ke7i0eeZHEsVhtzaS0AeLQOrYE1F+ppCwjR2TWeJQPA="; }; + patches = [ ./proc_globdata.patch ]; + postPatch = '' substituteInPlace app/proc_globdata.pas \ - --replace "/usr/share/cudatext" "$out/share/cudatext" \ - --replace "libpython3.so" "${python3}/lib/libpython${python3.pythonVersion}.so" \ - --replace "AllowProgramUpdates:= true;" "AllowProgramUpdates:= false;" + --subst-var out \ + --subst-var-by python3 ${python3} ''; nativeBuildInputs = [ lazarus fpc ] diff --git a/pkgs/applications/editors/cudatext/proc_globdata.patch b/pkgs/applications/editors/cudatext/proc_globdata.patch new file mode 100644 index 000000000000..b89476bb5fcb --- /dev/null +++ b/pkgs/applications/editors/cudatext/proc_globdata.patch @@ -0,0 +1,30 @@ +diff --git i/app/proc_globdata.pas w/app/proc_globdata.pas +index d161b09c7..0fcfbdc09 100644 +--- i/app/proc_globdata.pas ++++ w/app/proc_globdata.pas +@@ -1342,6 +1342,7 @@ begin + + {$ifdef unix} + for Dir in [ ++ '@python3@/lib', + '/usr/lib64', + '/usr/lib', + '/usr/lib/x86_64-linux-gnu' +@@ -1364,7 +1365,7 @@ var + function GetDirPrecopy: string; + begin + {$ifdef linux} +- exit('/usr/share/cudatext'); ++ exit('@out@/share/cudatext'); + {$endif} + + {$ifdef darwin} +@@ -2056,7 +2057,7 @@ begin + FindWrapAtEdge_Delay:= 350; + FindWrapAtEdge_ThemeItem:= ''; //'EdMarkedRangeBg'; + +- AllowProgramUpdates:= true; ++ AllowProgramUpdates:= false; + EscapeClose:= false; + EscapeCloseConsole:= true; + EscapeCloseFinder:= true; diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index c5cc91c1268d..789420fdfc6e 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -90,6 +90,7 @@ , withXinput2 ? withX && lib.versionAtLeast version "29" , withXwidgets ? !stdenv.isDarwin && !noGui && (withGTK3 || withPgtk) , withSmallJaDic ? false +, withCompressInstall ? true # Options , siteStart ? ./site-start.el @@ -339,6 +340,7 @@ mkDerivation (finalAttrs: { ++ lib.optional withXinput2 "--with-xinput2" ++ lib.optional withXwidgets "--with-xwidgets" ++ lib.optional withSmallJaDic "--with-small-ja-dic" + ++ lib.optional (!withCompressInstall) "--without-compress-install" ; env = lib.optionalAttrs withNativeCompilation { diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index 7d3b964fb15c..323218f9437b 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -12,6 +12,17 @@ rustPlatform.buildRustPackage rec { stripRoot = false; }; + patches = [ + # Fixes implicit int error in rescript grammar when building with clang 16. + # https://github.com/nkrkv/tree-sitter-rescript/pull/227. + (fetchpatch { + url = "https://github.com/nkrkv/tree-sitter-rescript/commit/ea93cbf7d9c52f925ed296b4714737e8088f3a19.patch"; + hash = "sha256-gpGPiy+yEs+dMJEnE5O3WC7iSB/6PLJYBYRcdTx//+o="; + extraPrefix = "runtime/grammars/sources/rescript/"; + stripLen = 1; + }) + ]; + cargoHash = "sha256-B8RO6BADDbPchowSfNVgviGvVgH23iF42DdhEBKBQzs="; nativeBuildInputs = [ git installShellFiles makeWrapper ]; diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json index 16598d02485c..62e1ae0d9525 100644 --- a/pkgs/applications/editors/standardnotes/src.json +++ b/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.178.4", + "version": "3.181.23", "deb": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.178.4/standard-notes-3.178.4-linux-amd64.deb", - "hash": "sha512-6er/a9PqhKU4aagAxsbVdoXbRBNUr3Fa8BPWfuQ74Q4ai+iYlPjd4q50cTJQ4wJ5ucGyopgBEJq4/xYNunw6Ig==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.181.23/standard-notes-3.181.23-linux-amd64.deb", + "hash": "sha512-zWjST3guI0qifvZIwSLJ0nIpU12Mu3+m25Xdoqv0BQC7tscChEdCGUAJRUKHEf0b8l4uvp8qBGHiBOfbrIi//w==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.178.4/standard-notes-3.178.4-linux-arm64.deb", - "hash": "sha512-lvvXCK3XOIH9HS1EU5eVBo4W8VoE4iM1Ve1XkZ/CysYBYLaXojXyybeN5Iw1Rmuk3trq/7RebjkNx/rxhsU0LQ==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.181.23/standard-notes-3.181.23-linux-arm64.deb", + "hash": "sha512-7R5Ym44mrVgUiqdt6NL8F9uUUOroQRxwn30xKThyIQm2HGRUJivRfOws98El9zV8bKG1khk4DZaMiLQSMjrtaQ==" } } } diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index ef0f15734a24..1f66a581dbe5 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,4 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qt5compat, quazip +, qtwayland , hunspell , wrapQtAppsHook, poppler, zlib, pkg-config }: @@ -27,6 +28,8 @@ stdenv.mkDerivation (finalAttrs: { qttools quazip zlib + ] ++ lib.optionals stdenv.isLinux [ + qtwayland ]; postInstall = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 2e84a8f2091c..68814ca5ba58 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -37,8 +37,11 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { # The Wine preloader must _not_ be linked to any system libraries, but `NIX_LDFLAGS` will link # to libintl, libiconv, and CoreFoundation no matter what. Delete the one that was built and # rebuild it with empty NIX_LDFLAGS. - rm loader/wine64-preloader - make loader/wine64-preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}="" + for preloader in wine-preloader wine64-preloader; do + rm loader/$preloader &> /dev/null \ + && ( echo "Relinking loader/$preloader"; make loader/$preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}="" ) \ + || echo "loader/$preloader not built, skipping relink." + done ''; }) // rec { inherit version src; @@ -109,7 +112,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { # uses property syntax in one place. The first patch is necessary only with older # versions of Wine. The second is needed on all versions of Wine. (lib.optional (lib.versionOlder version "8.12") ./darwin-metal-compat-pre8.12.patch) - ./darwin-metal-compat.patch + (lib.optional (lib.versionOlder version "8.18") ./darwin-metal-compat-pre8.18.patch) + (lib.optional (lib.versionAtLeast version "8.18") ./darwin-metal-compat.patch) # Wine requires `qos.h`, which is not included by default on the 10.12 SDK in nixpkgs. ./darwin-qos.patch ] @@ -203,6 +207,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { fromSource binaryNativeCode # mono, gecko ]; + broken = stdenv.isDarwin && !supportFlags.mingwSupport; description = if supportFlags.waylandSupport then "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)" else "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; platforms = if supportFlags.waylandSupport then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms; maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira reckenrode ]; diff --git a/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.18.patch b/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.18.patch new file mode 100644 index 000000000000..181b2a0d1a47 --- /dev/null +++ b/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.18.patch @@ -0,0 +1,12 @@ +diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m +--- a/dlls/winemac.drv/cocoa_display.m ++++ b/dlls/winemac.drv/cocoa_display.m +@@ -354,7 +354,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp + + device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; + if (device && [device respondsToSelector:@selector(registryID)]) +- ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); ++ ret = macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]); + + done: + [pool release]; diff --git a/pkgs/applications/emulators/wine/darwin-metal-compat.patch b/pkgs/applications/emulators/wine/darwin-metal-compat.patch index 181b2a0d1a47..8176be8ef383 100644 --- a/pkgs/applications/emulators/wine/darwin-metal-compat.patch +++ b/pkgs/applications/emulators/wine/darwin-metal-compat.patch @@ -1,12 +1,13 @@ diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m +index fbbe16efcbf..2db375ff3d5 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m -@@ -354,7 +354,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp +@@ -387,7 +387,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; if (device && [device respondsToSelector:@selector(registryID)]) -- ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); -+ ret = macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]); - - done: - [pool release]; +- return macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); ++ return macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]); + else + return -1; + } diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 813d032bf964..1bd1d6a8214d 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "8.17"; + version = "8.20"; url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz"; - hash = "sha256-8BeFvTFix05l3rE6oK3XEeN8SERUcZvt0OjCsaNGm34="; + hash = "sha256-SNa3a9ZDBaICBX+8GdkiwfSWJfbRqYJZJ8ChhXJzmYI="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -88,9 +88,9 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "8.0.0"; + version = "8.1.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - hash = "sha256-dbP0XcodyJhX/p6TLaeHEPZMxtSe8asMcjoXcIW0cRs="; + hash = "sha256-DtPsUzrvebLzEhVZMc97EIAAmsDFtMK8/rZ4rJSOCBA="; }; updateScript = writeShellScript "update-wine-unstable" '' @@ -116,8 +116,8 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases - version = "8.17.1"; - hash = "sha256-h36NDFYsI0y8TG41IH10IdF4QEuBkBewQ3knZ9iwDpg="; + version = "8.20"; + hash = "sha256-CiWTXjUR1+GY+MO7djHfVUH71zSo3lpH9IaqS5zCeJ8="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; @@ -127,12 +127,12 @@ in rec { wayland = fetchFromGitLab { # https://gitlab.collabora.com/alf/wine/-/tree/wayland - version = "8.0"; - hash = "sha256-whRnm21UyKZ4AQufNmctzivISVobnCeidmpYz65vlyk="; + version = "8.2"; + hash = "sha256-Eb2SFBIeQQ3cVZkUQcwNT5mcYe0ShFxBdMc3BlqkwTo="; domain = "gitlab.collabora.com"; owner = "alf"; repo = "wine"; - rev = "2f80bd757739f2dd8da41abceae6b87d2c568152"; + rev = "b2547ddf9e08cafce98cf7734d5c4ec926ef3536"; inherit (unstable) gecko32 gecko64; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 5e1fbe375876..f3587cf2ea5d 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -56,13 +56,13 @@ let python = python2.withPackages (pp: [ pp.pygtk ]); in stdenv.mkDerivation (finalAttrs: { pname = "gimp"; - version = "2.10.34"; + version = "2.10.36"; outputs = [ "out" "dev" ]; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.bz2"; - sha256 = "hABGQtNRs5ikKTzX/TWSBEqUTwW7UoUO5gaPJHxleqM="; + sha256 = "sha256-PTvDxppL2zrqm6LVOF7ZjqA5U/OFeq/R1pdgEe1827I="; }; patches = [ diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 5d5c981526d9..2a46cfd50035 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -9,25 +9,25 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.18" else "8.10.20-1.BETA"; + version = if channel == "stable" then "8.10.20" else "8.10.20-1.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-3oK8Jzz4+TY4IW8oAenzHo7KQeP58iZ+on5PNliBn7I="; + hash = "sha256-KOKqI64uI454ryLy/zdD0jxgY3GekBFoh028ftt1Twg="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-OsmgHPlAt9K7ytXMM8BANGcKcD3U1OLd2MLfOS4lc6Q="; + hash = "sha256-8MDJFG5d81Alxs1hqLw7DP+Pte+haGKfiZ/erGvks5A="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-wozym2QOLLUf4F+MwdIZfwN+VHkNewB+ZJZEkVNnb/c="; + hash = "sha256-T+f19Q/pzsC6lh8OF/w/pzRLBfAdlk1gwQz8funkx8Q="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-v1FZIsvFyIx81BORgDtZBP9jTRY6/0p537trOGf8mcM="; + hash = "sha256-kmal5wfqCKAlg7c+xVHM39qrucr+Kaxr4pNBYwKfs5g="; }; }; beta = { diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 89ff023f86fe..9030421dbee4 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.22.0"; + version = "2.23.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-MWNbwCJ5ltAV1qmy8LPYkb6VTH0UVi2S5QEZZfpcnGM=" "zip"; - i686-linux = fetch "linux_386" "sha256-lqwEm7fCiM2WNZvlAt/HeqI2zxnal/OMbTMGvvmXkvY=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-GfQ441a5mIgCTtxnk6L9UXodNGXek7f/jxJXWYJUb+0=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-yF0dy4MUgvSJUremXFfxCIHcGmYrCcjofcv1sBD9qyI=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-WBUHS1qoKHGJb6ktw8BD3V0H0419BO3EyTh675UnZRA=" "zip"; + i686-linux = fetch "linux_386" "sha256-pulMvdE8COwRBk3IBBXqYPk2+A1XuCN9TxtGqm1HFeM=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-w0ieg9MxjmkABc4LRZIGyfDjbOter0pKRigLZBhosz4=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-fRkvkLnhr0oZCcCGhQd53Oj8uTxsgaSUkxD7p7CPOwI=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 7a6db59bf66d..24ea7287160b 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -3,7 +3,7 @@ , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libwebp, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio, openjpeg, python310Packages , openvdb, libXxf86vm, tbb, alembic -, zlib, zstd, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath +, zlib, zstd, fftw, fftwFloat, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , jackaudioSupport ? false, libjack2 , cudaSupport ? config.cudaSupport, cudaPackages ? { } , hipSupport ? false, rocmPackages # comes with a significantly larger closure size @@ -30,15 +30,19 @@ let url = "https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip"; sha256 = "0max1j4822mchj0xpz9lqzh91zkmvsn4py0r174cvqfz8z8ykjk8"; }; + libdecor' = libdecor.overrideAttrs (old: { + # Blender uses private APIs, need to patch to expose them + patches = (old.patches or [ ]) ++ [ ./libdecor.patch ]; + }); in stdenv.mkDerivation (finalAttrs: rec { pname = "blender"; - version = "3.6.5"; + version = "4.0.1"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - hash = "sha256-QAHA/pn22HLsfH6VX4Sp7r25raFxAPS1Gergjez38kM="; + hash = "sha256-/jLU0noX5RxhQ+26G16nGFylm65Lzfm9s11oCWCC43Q="; }; patches = [ @@ -53,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: rec { buildInputs = [ boost ffmpeg gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff libwebp - opencolorio openexr openimageio openjpeg python zlib zstd fftw jemalloc + opencolorio openexr openimageio openjpeg python zlib zstd fftw fftwFloat jemalloc alembic (opensubdiv.override { inherit cudaSupport; }) tbb @@ -65,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: rec { openpgl ] ++ lib.optionals waylandSupport [ - wayland wayland-protocols libffi libdecor libxkbcommon dbus + wayland wayland-protocols libffi libdecor' libxkbcommon dbus ] ++ lib.optionals (!stdenv.isAarch64) [ openimagedenoise diff --git a/pkgs/applications/misc/blender/libdecor.patch b/pkgs/applications/misc/blender/libdecor.patch new file mode 100644 index 000000000000..73c32f983cc2 --- /dev/null +++ b/pkgs/applications/misc/blender/libdecor.patch @@ -0,0 +1,34 @@ +diff --git a/src/libdecor-plugin.h b/src/libdecor-plugin.h +index ba80ce6..59199dd 100644 +--- a/src/libdecor-plugin.h ++++ b/src/libdecor-plugin.h +@@ -132,12 +132,6 @@ struct libdecor_plugin_interface { + struct wl_surface * + libdecor_frame_get_wl_surface(struct libdecor_frame *frame); + +-int +-libdecor_frame_get_content_width(struct libdecor_frame *frame); +- +-int +-libdecor_frame_get_content_height(struct libdecor_frame *frame); +- + enum libdecor_window_state + libdecor_frame_get_window_state(struct libdecor_frame *frame); + +diff --git a/src/libdecor.h b/src/libdecor.h +index af67e2f..b5eba41 100644 +--- a/src/libdecor.h ++++ b/src/libdecor.h +@@ -532,6 +532,12 @@ bool + libdecor_configuration_get_window_state(struct libdecor_configuration *configuration, + enum libdecor_window_state *window_state); + ++int ++libdecor_frame_get_content_width(struct libdecor_frame *frame); ++ ++int ++libdecor_frame_get_content_height(struct libdecor_frame *frame); ++ + #ifdef __cplusplus + } + #endif diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix index cbcb88b9d1a8..2690db2d9fbf 100644 --- a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix @@ -18,17 +18,10 @@ let maintainers = with maintainers; [ mjanczyk svsdep mgregoire ]; }; - pluginFilename = "KeePassRPC.plgx"; - - unpackCmd = '' - mkdir deps/ - cp -p $src deps/$pluginFilename - ''; - sourceRoot = "deps"; - + dontUnpack = true; installPhase = '' mkdir -p $out/lib/dotnet/keepass/ - cp $pluginFilename $out/lib/dotnet/keepass/$pluginFilename + cp $src $out/lib/dotnet/keepass/ ''; }; in diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 38da8824cb0d..d7db123ef4e3 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,27 +1,19 @@ { stdenv, lib, substituteAll, makeWrapper, fetchFromGitHub, fetchpatch, ocaml, pkg-config, mupdf, libX11, jbig2dec, openjpeg, libjpeg , lcms2, harfbuzz, -libGLU, libGL, gumbo, freetype, zlib, xclip, inotify-tools, procps }: +libGLU, libGL, gumbo, freetype, zlib, xclip, inotify-tools, procps, darwin }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; stdenv.mkDerivation rec { pname = "llpp"; - version = "41"; + version = "42"; src = fetchFromGitHub { owner = "criticic"; repo = pname; rev = "v${version}"; - hash = "sha256-Doj0zLYI1pi7eK01+29xFLYPtc8+fWzj10292+PmToE="; + hash = "sha256-B/jKvBtBwMOErUVmGFGXXIT8FzMl1DFidfDCHIH41TU="; }; - patches = [ - (fetchpatch { - name = "system-makedeps-and-ocaml5.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/system-makedeps-and-ocaml5.patch?h=llpp&id=32955e115f914bb96348d288f9af9c6e3e80a02b"; - hash = "sha256-3rcPsR+M8Jx7M8GHUIsw0WNBvp6aE7BcPr4yk2vT9Ik="; - }) - ]; - postPatch = '' sed -i "2d;s/ver=.*/ver=${version}/" build.bash ''; @@ -29,7 +21,9 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ makeWrapper ocaml pkg-config ]; - buildInputs = [ mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ]; + buildInputs = [ mupdf libX11 freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ] + ++ lib.optionals stdenv.isLinux [ libGLU libGL ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.OpenGL darwin.apple_sdk.frameworks.Cocoa ]; dontStrip = true; @@ -46,7 +40,7 @@ stdenv.mkDerivation rec { install -d $out/bin install build/llpp $out/bin install misc/llpp.inotify $out/bin/llpp.inotify - + '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/llpp \ --prefix PATH ":" "${xclip}/bin" @@ -59,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://repo.or.cz/w/llpp.git"; description = "A MuPDF based PDF pager written in OCaml"; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; license = licenses.gpl3; }; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 96f033744e6b..232a4456e60e 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -21,11 +21,11 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; - version = "5.15.4"; + version = "5.15.6"; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "sha256-5pEpYnJFHQKEfTve07ngFVDAOM9+kwrx6hc30gEwsko="; + sha256 = "sha256-WOWDekh9rcXeiN/ejiYC4BELhJwd98GkmyDOLN26ayU="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 2e2ca3341d83..9c5225eb1b4b 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.10.13"; + version = "0.10.15"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-DhMoNI1eRzP9FK752Z8sAcuj5dpu2vRqXRv4tbSYmLE="; + hash = "sha256-1r/f3CoTaOA2ZfM9UBGftZDZdCL9JIrs6SvaSO8BI6w="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index 29428d8360ea..b1ca2a74542b 100644 --- a/pkgs/applications/networking/cluster/calico/default.nix +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -2,16 +2,16 @@ builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec { inherit pname; - version = "3.26.3"; + version = "3.26.4"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-KbtQ5oMZ1ygYwbaKpyAKTprPZ6+ikDbGLafwOShVd6w="; + hash = "sha256-idpvGgtvjtLuW+eQIldWihqgzWIFEM0bK0Ux61dD//w="; }; - vendorHash = "sha256-1PBdDpc/cvI5uN6/msxXoMXbx7Osgq12W1VqtZ7XtGE="; + vendorHash = "sha256-Dl0YLXrw/roKLmp8cZUa1v2n/UwzOGoL0AN8fNVMknU="; inherit doCheck subPackages; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 8e1c1c14fd16..0a7f5178ef19 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.15.11"; + version = "0.15.12"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - hash = "sha256-czU5o6QS4MsXyyedQ0nzwDiCQacHcDsbm2iDk7nU+Y8="; + hash = "sha256-Js//4dB8b3w9AOvMhXt91G87FzQ8jHq3W3pJHzLbluA="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index 8396889f532b..5d2804251146 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "cmctl"; - version = "1.13.1"; + version = "1.13.2"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; rev = "v${version}"; - hash = "sha256-l0D7uVoYTwiVI+b8yYpsJk/eAG5XYidR9CaQ595aTjw="; + hash = "sha256-TfFdHKXbbi0yqvyQjZArY9GbkwjUq1Z00UuNAldyDuc="; }; sourceRoot = "${src.name}/cmd/ctl"; - vendorHash = "sha256-3Ws2ObyBVYog7oVqHeEgIeWeRQpV1Z+Clilp8wI/PUA="; + vendorHash = "sha256-63XxGvVsIRDpQ0ri6VkjciyD+k7eEMBcg0w8NU8ypYs="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index ac142ca3597e..f67d650e77a5 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.28.3"; + version = "1.28.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-lb9FAk3b6J92viyHzLCzbYRxhQS94/FQvDr1m1kdTq8="; + hash = "sha256-aaGcAIyy0hFJGFfOq5FaF0qAlygXcs2WcwgvMe5dkbo="; }; vendorHash = null; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 1862cf6e04a7..6a5cdfd152de 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,14 +1,14 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.33"; - ptb = "0.0.53"; - canary = "0.0.173"; - development = "0.0.1"; + stable = "0.0.35"; + ptb = "0.0.56"; + canary = "0.0.184"; + development = "0.0.0"; } else { - stable = "0.0.282"; - ptb = "0.0.84"; - canary = "0.0.329"; + stable = "0.0.284"; + ptb = "0.0.87"; + canary = "0.0.340"; development = "0.0.2"; }; version = versions.${branch}; @@ -16,33 +16,33 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-UVgufPNIS7fa3VDzjCWwgK3xxmqNivq461qWLgirClc="; + hash = "sha256-VcSRV9LDiUXduRt20kVeAnwinl6FmACQgn//W6eFyys="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-g2NhwkfNi5Yf+n9vHq/MJ0kylPF3MPocgF/zYfCvoZM="; + hash = "sha256-RDXApmhlu2aQTjWVXMyRp0CL29btsQufIPuxjjtJGIU="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-YFjGUAaZMy1JhtKhAqLbfYTKQSgS9TKWqR078cERNUI="; + hash = "sha256-Pu0kei/ls9yrDEpRQcgDAaEkRbYkFmp/jTwOkljoy18="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-ogLOZZ9pTXB01TqdnmdORIzZ8GbGzskUzbG4E68gZwY="; + hash = "sha256-/+9NyreRkXu2++uhwCh3/C1Cos39hfzB0Yjf0Otg9pk="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-3WeC+4W9+tpXNXqETorQfnE1HZWCqRkBqW0JM7whRCw="; + hash = "sha256-TTzhc6P0hFG9BFMviNx8CCg1cVEKDiB3gtb8oR/slNA="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-e2gvjXUw0Yx8UY6utg1SdX8/buewuVYPl5I8fS3QtrI="; + hash = "sha256-cl6+kTth/7j+HJHPU4Oy1N5EnmMbpdvltKzrU1by+Ik="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-B4LPFts+sx8GpZp9iRbwapUYrK4c9unH+mAoODGqDgU="; + hash = "sha256-LfixXyCoTnifw2GVAnCDnBla757JyGzbvUJwY4UhgGI="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; diff --git a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix index 7989713d4a3d..214551cf237c 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix @@ -8,12 +8,12 @@ }: let - version = "1.11.3"; + version = "1.11.4"; pname = "session-desktop"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - hash = "sha256-HdgW7Ls0h75BXKXGzzf37K9w4bgkfA9eAUEmBrSDT+U="; + hash = "sha256-fSa113BYpTZ4jvxroQsoslAkWfQr4/ROkgVOFyiVsKQ="; }; appimage = appimageTools.wrapType2 { inherit version pname src; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index a18afedaecdc..0e66707349db 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.38.0"; - hash = "sha256-y2mwO7Qc01vuIeJUcAxYDD97DXOwXCd8wNZmkG4maF0="; + version = "6.39.0"; + hash = "sha256-cG8ZFWpx92haTgMkpMMcFDV0OB7lmU540g9fNj4ofy8="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.39.0-beta.2"; - hash = "sha256-1+1wvkMtEovBBs2bS9zUV5kpSxkPy0EqBAU01el8uko="; + version = "6.40.0-beta.1"; + hash = "sha256-daXh1Uh2lHw0NA/j7qhQK7nrVljbr/fP2iLjcqnuvns="; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index b5879ffe5b46..694021d0f7fe 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -82,15 +82,15 @@ stdenv.mkDerivation { }) ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = '' + rm -r src/third_party/libsrtp + cp -r --no-preserve=mode ${libsrtp} src/third_party/libsrtp + '' + lib.optionalString stdenv.isLinux '' substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \ --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ --replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \ --replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"' \ --replace '"libdrm.so.2"' '"${libdrm}/lib/libdrm.so.2"' - - rm -r src/third_party/libsrtp - cp -r --no-preserve=mode ${libsrtp} src/third_party/libsrtp ''; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index c5a07a89c35e..a9becb9d8c90 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -1,40 +1,48 @@ -{ lib, python3Packages, fetchPypi, notmuch }: +{ lib, python3Packages, fetchPypi, pkgs }: python3Packages.buildPythonApplication rec { pname = "afew"; version = "3.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "0wpfqbqjlfb9z0hafvdhkm7qw56cr9kfy6n8vb0q42dwlghpz1ff"; }; - nativeBuildInputs = with python3Packages; [ sphinx setuptools-scm ]; + nativeBuildInputs = with python3Packages; [ + sphinxHook + setuptools + setuptools-scm + ]; + + sphinxBuilders = [ + "html" + "man" + ]; propagatedBuildInputs = with python3Packages; [ - python3Packages.setuptools python3Packages.notmuch chardet dkimpy + chardet + dkimpy + notmuch ]; - nativeCheckInputs = with python3Packages; [ - freezegun notmuch - ]; + nativeCheckInputs = [ + pkgs.notmuch + ] ++ (with python3Packages; [ + freezegun + pytestCheckHook + ]); makeWrapperArgs = [ - ''--prefix PATH ':' "${notmuch}/bin"'' + ''--prefix PATH ':' "${pkgs.notmuch}/bin"'' ]; - outputs = [ "out" "doc" ]; - - postBuild = '' - ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py build_sphinx -b html,man - ''; - - postInstall = '' - install -D -v -t $out/share/man/man1 build/sphinx/man/* - mkdir -p $out/share/doc/afew - cp -R build/sphinx/html/* $out/share/doc/afew - ''; - + outputs = [ + "out" + "doc" + "man" + ]; meta = with lib; { homepage = "https://github.com/afewmail/afew"; diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 44eba5bc021e..0d0be882f430 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.118.13"; + version = "3.118.27"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - hash = "sha256-3kpfF/XG7w6qUooS5UsntMKnggG1LhmV9f+R35kkmb0="; + hash = "sha256-z2Ir8O7IDiE7cYuLshpMQMnOJanaECUvKlUEyPayIPo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 839766e2ac7b..82f8ec4d55b1 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "pan"; - version = "0.154"; + version = "0.155"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = "v${version}"; - hash = "sha256-o+JFUraSoQ0HDmldHvTX+X7rl2L4n4lJmI4UFZrsfkQ="; + hash = "sha256-DsoTqZLcZOc3HlpCC8rmu/rcFeHkb9IWd4PSLwxKqJI="; }; nativeBuildInputs = [ autoreconfHook pkg-config gettext intltool itstool libxml2 makeWrapper ]; diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index b9c88bf3bdc1..d1aef5180837 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -8,6 +8,8 @@ , flask , flask-httpauth , flask-socketio +, gevent-socketio +, gevent-websocket , cepa , psutil , pyqt5 @@ -80,6 +82,8 @@ rec { flask flask-httpauth flask-socketio + gevent-socketio + gevent-websocket cepa psutil pycrypto diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index c576319643f5..824a20a31329 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -5,12 +5,12 @@ }: let - version = "6.5.0"; + version = "6.6.0"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - sha256 = "sha256-RO8PhEjvDye6p6vgqNexIJ1ymTlVtF8yWQAUbJGaZYk="; + sha256 = "sha256-RmWRNKy2w3BM/ipQyFpkNC3+XXsJXjN6VYWNo8OKpy0="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index 66a932b9c99d..a337470664af 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-3SQ3a1gg4/cXy8BJXazTgh6nkS/KQpM0fCA6JcbHOPc="; + hash = "sha256-uCWdDmHzNx1vkZFttQZLD4YfXoXz5VZQfir9sGOoDhw="; }; postPatch = lib.optionalString stdenv.isDarwin '' @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { --replace "-Wl,-ld_classic" "" substituteInPlace src/CMakeLists.txt \ --replace "\''${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler" "dylibbundler" - sed -i "/hdiutil/d" src/CMakeLists.txt + sed -i "/codesign/d;/hdiutil/d" src/CMakeLists.txt ''; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/picoscope/sources.json b/pkgs/applications/science/electronics/picoscope/sources.json index 15a748dc7cee..6b1d81978b9d 100644 --- a/pkgs/applications/science/electronics/picoscope/sources.json +++ b/pkgs/applications/science/electronics/picoscope/sources.json @@ -1,69 +1,69 @@ { "x86_64-linux": { "libpicocv": { - "sha256": "feddc1cb9082005e80c4e2c2732ee4c537915c463ea327aa53a642aab95b8691", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicocv/libpicocv_1.1.33-beta2r167_amd64.deb", - "version": "1.1.33-beta2r167" + "sha256": "c0c5bec33c2c7fdd0f26b035ed942175f87012e33d6764c3abf1da31b5626037", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicocv/libpicocv_1.1.34-beta2r172_amd64.deb", + "version": "1.1.34-beta2r172" }, "libpicoipp": { - "sha256": "2d749b8fd5dbd811c270e4aa78c5ee9cd33832b90d089ae386b0f85aed2d0204", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicoipp/libpicoipp_1.4.0-4r136_amd64.deb", - "version": "1.4.0-4r136" + "sha256": "4a84f0af7f4e8cba91fad620eac0cd23c36b2fdda4637904be564286b10ffe1d", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicoipp/libpicoipp_1.4.0-4r161_amd64.deb", + "version": "1.4.0-4r161" }, "libps2000": { - "sha256": "d306890d1e87651ae83ef00143c8e62b82fae2be39886b6884408751cb910fa4", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.89-3r3163_amd64.deb", - "version": "3.0.89-3r3163" + "sha256": "473b065e79a7414c1e2b8c8468c8d2654333ac28f3a8c33b535626b33c60d2ca", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.127-3r5552_amd64.deb", + "version": "3.0.127-3r5552" }, "libps2000a": { - "sha256": "38391dfbe6c6c04ba5b5c99bd53404d5342e40c9eca703e3d95cbc6302114270", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.1.89-5r3163_amd64.deb", - "version": "2.1.89-5r3163" + "sha256": "8eba0052f9c7ef327710f2fba5aa11bec0c20225b39d77bb7b69cf80055c039c", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.1.127-5r5552_amd64.deb", + "version": "2.1.127-5r5552" }, "libps3000": { - "sha256": "39b4b56a839eb5d7abcf1de2bab472c2de2d8aa5ffc3ba445e99d5aa8178ba07", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.89-3r3163_amd64.deb", - "version": "4.0.89-3r3163" + "sha256": "4e786036b8de0dd0f922aed947f30a53d31bed46b2df5132e8c9480c8a5d93e9", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.127-3r5552_amd64.deb", + "version": "4.0.127-3r5552" }, "libps3000a": { - "sha256": "ea96735b90d02c72c9c7b517413fed0d366ac634100e22467a39c780985669e4", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.1.89-6r3163_amd64.deb", - "version": "2.1.89-6r3163" + "sha256": "d2bb1e5bb151b0953ed30ca5421bb93d05dab898c33cdc89927e943ea991867a", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.1.127-6r5552_amd64.deb", + "version": "2.1.127-6r5552" }, "libps4000": { - "sha256": "7177cd4debf811fa7d7105703a4fc546fe1a79fc3275e3f36326b014c1334f55", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.89-2r3163_amd64.deb", - "version": "2.1.89-2r3163" + "sha256": "4c127e67949835b5ab5c5c8caa55f73c69df354d761aa53d6df99c8f8ac39009", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.127-2r5552_amd64.deb", + "version": "2.1.127-2r5552" }, "libps4000a": { - "sha256": "ebe94d6d9f349e5082dcbed55d059ac77c0129b967467786d1cef3f662ebac99", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.1.89-2r3163_amd64.deb", - "version": "2.1.89-2r3163" + "sha256": "26df82bc946e5bb30d599c4c365247bdbaa01e830d4d00630b46a6abcc1eef04", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.1.127-2r5552_amd64.deb", + "version": "2.1.127-2r5552" }, "libps5000": { - "sha256": "732164658acb4bdfdbf3fc785419ea6a4944ed2892be9dde134b345a976c3318", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.89-3r3163_amd64.deb", - "version": "2.1.89-3r3163" + "sha256": "106ef17862e98c3621f95c377f271c843664f481f84ef918d9eadd013561cd1b", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.127-3r5552_amd64.deb", + "version": "2.1.127-3r5552" }, "libps5000a": { - "sha256": "3438f51c8646e3ac5a479c88aa7a89b3dfcce2090720317b4efb8db538372cdb", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.1.89-5r3163_amd64.deb", - "version": "2.1.89-5r3163" + "sha256": "fe9def134ef9df6654485911f14ece7b2ee3d79113aeee7826dd6e36bb5de3b4", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.1.127-5r5552_amd64.deb", + "version": "2.1.127-5r5552" }, "libps6000": { - "sha256": "fe4165ab0d323728b473347b61439b074486809d673e47f169d0062cf917191c", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.89-6r3163_amd64.deb", - "version": "2.1.89-6r3163" + "sha256": "9b08c5b7fb2d34b0e2e98f2e0452a59105f612cd445a9e45d3cac14d931d18f2", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.127-6r5552_amd64.deb", + "version": "2.1.127-6r5552" }, "libps6000a": { - "sha256": "0552811f92a015ef47b09947631f5f5d8c30b122425de083bea79df88957a9c7", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_1.0.89-0r3163_amd64.deb", - "version": "1.0.89-0r3163" + "sha256": "2a23ccad72b9be83b87d449b6bb8ded23fd29c85ec9f78a45b6d45b38ccf335b", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_1.0.127-0r5552_amd64.deb", + "version": "1.0.127-0r5552" }, "picoscope": { - "sha256": "b060edb02bc2de5d10a45d31d4b7f9c767d18511e2f65a1ebdd70cc3e8780262", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.0.100-1r11387_amd64.deb", - "version": "7.0.100-1r11387" + "sha256": "d95f269171da7273b596dae95452789e889f12ef0f15c3baea26dd1b3a8117fc", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.1.17-1r17318_amd64.deb", + "version": "7.1.17-1r17318" } } } diff --git a/pkgs/applications/science/math/eigenmath/default.nix b/pkgs/applications/science/math/eigenmath/default.nix index 603a3c4f60bf..1e80d9a06eba 100644 --- a/pkgs/applications/science/math/eigenmath/default.nix +++ b/pkgs/applications/science/math/eigenmath/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "eigenmath"; - version = "unstable-2023-10-26"; + version = "unstable-2023-11-17"; src = fetchFromGitHub { owner = "georgeweigt"; repo = pname; - rev = "043895fbaed27a4baace7c7c0c1f69ea5a9f3d1a"; - hash = "sha256-roPyRaT89I3HbyvBK/owiigMus1EeKEhhKHFsgfzp10="; + rev = "b0d822f10243ad5b1c88efb5a82b43a0bbf1bfbc"; + hash = "sha256-eJ/EmzV5UZGxwZNIna/XXkYY+vkLc610KcywBFPRfyM="; }; checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index afd3205343e5..950d2f8f401e 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -1,4 +1,6 @@ { lib +, stdenv +, darwin , fetchFromGitHub , rustPlatform , nixosTests @@ -14,18 +16,21 @@ , vulkan-loader , libxkbcommon -, withX11 ? true +, withX11 ? !stdenv.isDarwin , libX11 , libXcursor , libXi , libXrandr , libxcb -, withWayland ? true +, withWayland ? !stdenv.isDarwin , wayland }: let - rlinkLibs = [ + rlinkLibs = if stdenv.isDarwin then [ + darwin.libobjc + darwin.apple_sdk.frameworks.AppKit + ] else [ (lib.getLib gcc-unwrapped) fontconfig libGL @@ -55,9 +60,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-XD+/DaaJEJ9jHZITTUma/wfsbduPUTc/SralPOx46Yo="; nativeBuildInputs = [ - autoPatchelfHook ncurses + ] ++ lib.optionals stdenv.isLinux [ pkg-config + autoPatchelfHook ]; runtimeDependencies = rlinkLibs; @@ -67,10 +73,9 @@ rustPlatform.buildRustPackage rec { outputs = [ "out" "terminfo" ]; buildNoDefaultFeatures = true; - buildFeatures = [ - (lib.optionalString withX11 "x11") - (lib.optionalString withWayland "wayland") - ]; + buildFeatures = [ ] + ++ lib.optional withX11 "x11" + ++ lib.optional withWayland "wayland"; checkFlags = [ # Fail to run in sandbox environment. @@ -86,6 +91,11 @@ rustPlatform.buildRustPackage rec { tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo mkdir -p $out/nix-support echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + '' + lib.optionalString stdenv.isDarwin '' + mkdir $out/Applications/ + mv misc/osx/Rio.app/ $out/Applications/ + mkdir $out/Applications/Rio.app/Contents/MacOS/ + ln -s $out/bin/rio $out/Applications/Rio.app/Contents/MacOS/ ''; passthru = { diff --git a/pkgs/applications/video/showmethekey/default.nix b/pkgs/applications/video/showmethekey/default.nix index 6a403e25c644..cd61cfc9d0d4 100644 --- a/pkgs/applications/video/showmethekey/default.nix +++ b/pkgs/applications/video/showmethekey/default.nix @@ -7,19 +7,20 @@ , json-glib , libinput , gtk4 +, libadwaita , wrapGAppsHook4 , libxkbcommon , pkg-config }: stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.8.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "AlynxZhou"; repo = pname; rev = "v${version}"; - hash = "sha256-IfegYHHFbZbMTA8JWXAun9Gl3BpykH/5RqUIrlYlLhk="; + hash = "sha256-eeObomb4Gv/vpvViHsi3+O0JR/rYamrlZNZaXKL6KJw="; }; nativeBuildInputs = [ @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk4 + libadwaita libevdev libinput libxkbcommon diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 3ff03781732b..82e814610dce 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-p16qHJD0i0ZNEFGEbfmbxiedX9/uHkZxhCeB3x/5iLM="; + hash = "sha256-/kCnzOL8CJuJJglHzmev3alt8cMwTUbIiZhNft9zwps="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 34cb0cc757cb..8a0161476863 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.78.0"; + version = "1.78.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-/FppBl25AgwZhNcwWmUc0ThaTm1U4lhaoCTTJ/R/srI="; + hash = "sha256-8/hHv5veTQXNg8c5oew+5FWLAQkytTD2+Gdb30sY9lo="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 9c19818b2f66..e35a5d16a49d 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GmIrz23z/vV6Ut31pajUmPfT9V37Ajs5JaIMD1Ociu8="; + sha256 = "sha256-yeZGhE+ImWXW3HPpAo+E1GOSEwPr7yK78XVmCocGqH4="; }; - cargoHash = "sha256-AwDaIHuD/0H/SkhxT/V0/4K/5yp+s5DI34e8JQgajgc="; + cargoHash = "sha256-xqKYd80PCM7Rnj+9dV2XjigE4sweOnL4HfOQiOYzCEQ="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix index 63a5e8613e18..1f07da0a7bc4 100644 --- a/pkgs/applications/window-managers/cagebreak/default.nix +++ b/pkgs/applications/window-managers/cagebreak/default.nix @@ -6,6 +6,7 @@ , libevdev , libinput , libxkbcommon +, xcbutilwm , makeWrapper , mesa , meson @@ -24,13 +25,13 @@ stdenv.mkDerivation rec { pname = "cagebreak"; - version = "1.9.1"; + version = "2.2.1"; src = fetchFromGitHub { owner = "project-repo"; repo = pname; rev = version; - hash = "sha256-pU1QHYOqnkb3L4iSKbZY9Vo60Z6EaX9mp2Nw48NSPic="; + hash = "sha256-cJEJ8V9lDbNb07eY3nWmNcT7ULGlcmOeyb9UDOLGWfI="; }; nativeBuildInputs = [ @@ -48,6 +49,7 @@ stdenv.mkDerivation rec { libevdev libinput libxkbcommon + xcbutilwm mesa # for libEGL headers pango pixman @@ -69,6 +71,8 @@ stdenv.mkDerivation rec { # Patch cagebreak to read its default configuration from $out/share/cagebreak sed -i "s|/etc/xdg/cagebreak|$out/share/cagebreak|" meson.build cagebreak.c + substituteInPlace meson.build \ + --replace "/usr/share/licenses" "$out/share/licenses" ''; postFixup = lib.optionalString withXwayland '' diff --git a/pkgs/applications/window-managers/e16/default.nix b/pkgs/applications/window-managers/e16/default.nix index 2f9475054c35..d47b63dda4d0 100644 --- a/pkgs/applications/window-managers/e16/default.nix +++ b/pkgs/applications/window-managers/e16/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "e16"; - version = "1.0.28"; + version = "1.0.29"; src = fetchurl { url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz"; - hash = "sha256-k3W2IoBc75DNQ2QSjChsC/yVRO/aZT3E31Tl/njgH30="; + hash = "sha256-LvLiw6+hduAl8dNBTtBwqvgKBRwojBUd5tNm1hZl5Hs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/br/braa/package.nix b/pkgs/by-name/br/braa/package.nix new file mode 100644 index 000000000000..380a829f8119 --- /dev/null +++ b/pkgs/by-name/br/braa/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenv, + fetchzip, + zlib, +}: +stdenv.mkDerivation rec { + pname = "braa"; + version = "0.82"; + + src = fetchzip { + url = "http://s-tech.elsat.net.pl/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-GS3kk432BdGx/sLzzjXvotD9Qn4S3U4XtMmM0fWMhGA="; + }; + + buildInputs = [zlib]; + + installPhase = '' + runHook preInstall + install -Dm755 braa $out/bin/braa + runHook postInstall + ''; + + meta = with lib; { + description = "A mass snmp scanner"; + homepage = "http://s-tech.elsat.net.pl"; + license = licenses.gpl2Only; + platforms = platforms.unix; + maintainers = with maintainers; [bycEEE]; + mainProgram = "braa"; + }; +} diff --git a/pkgs/by-name/de/devdash/package.nix b/pkgs/by-name/de/devdash/package.nix new file mode 100644 index 000000000000..210a016277f6 --- /dev/null +++ b/pkgs/by-name/de/devdash/package.nix @@ -0,0 +1,52 @@ +{ + lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +, coreutils +}: + +buildGoModule rec { + pname = "devdash"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "Phantas0s"; + repo = "devdash"; + rev = "refs/tags/v${version}"; + hash = "sha256-RUPpgMVl9Cm8uhztdfKnuQ6KdMn9m9PewlT59NnTSiY="; + }; + + vendorHash = "sha256-xuc8rAkyCInNFxs5itwabqBe4CPg/sAuhcTJsapx7Q8="; + + ldflags = [ + "-s -w" + "-X github.com/Phantas0s/devdash/cmd.current=${version}" + "-X github.com/Phantas0s/devdash/cmd.buildDate=1970-01-01-00:00:01" + ]; + + patchPhase = '' + runHook prePatch + + shopt -s globstar + substituteInPlace **/*.go --replace '"/bin/' '"/usr/bin/env ' + shopt -u globstar + + runHook postPatch + ''; + + runtimeDependencies = [ + coreutils + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Highly configurable terminal dashboard for developers and creators"; + homepage = "https://github.com/Phantas0s/devdash"; + changelog = "https://github.com/Phantas0s/devdash/blob/v${version}/CHANGELOG.md"; + maintainers = with lib.maintainers; [ h7x4 ]; + license = lib.licenses.asl20; + mainProgram = "devdash"; + }; +} diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index a670490ef0ad..28ebab5239a6 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.163.0"; + version = "0.164.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-rpyLjoHMSgEHTILeEQpUKD7BOJHn/uT3GK6Fquirzdk="; + hash = "sha256-ENlMcwk4bMbIzV353vt+EG776+/ajrg5la3JeA81QS4="; }; vendorHash = "sha256-NOhssVWEkvoXpmnsCVVT7Li0ePGWDSGIlB2MyFtMnpI="; diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/by-name/fr/free42/package.nix similarity index 69% rename from pkgs/applications/misc/free42/default.nix rename to pkgs/by-name/fr/free42/package.nix index dd8405772caf..d821bbf628f9 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/by-name/fr/free42/package.nix @@ -1,22 +1,22 @@ { lib , stdenv , fetchFromGitHub -, makeDesktopItem -, copyDesktopItems -, pkg-config -, gtk3 , alsa-lib +, copyDesktopItems +, gtk3 +, makeDesktopItem +, pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "free42"; - version = "3.0.21"; + version = "3.1"; src = fetchFromGitHub { owner = "thomasokken"; - repo = pname; - rev = "v${version}"; - hash = "sha256-zRO0buYfKtybUisWZJRkvLJVLJYZwLcDnT04rnQWy+s="; + repo = "free42"; + rev = "v${finalAttrs.version}"; + hash = "sha256-v3nZMjV9KnoTefeu2jl3k1B7efnJnNVOAfDVLyce6QI="; }; nativeBuildInputs = [ @@ -35,6 +35,27 @@ stdenv.mkDerivation rec { dontConfigure = true; + desktopItems = [ + (makeDesktopItem { + name = "com.thomasokken.free42bin"; + desktopName = "Free42Bin"; + genericName = "Calculator"; + exec = "free42bin"; + type = "Application"; + comment = finalAttrs.meta.description; + categories = [ "Utility" "Calculator" ]; + }) + (makeDesktopItem { + name = "com.thomasokken.free42dec"; + desktopName = "Free42Dec"; + genericName = "Calculator"; + exec = "free42dec"; + type = "Application"; + comment = finalAttrs.meta.description; + categories = [ "Utility" "Calculator" ]; + }) + ]; + buildPhase = '' runHook preBuild @@ -50,48 +71,28 @@ stdenv.mkDerivation rec { runHook preInstall install --directory $out/bin \ - $out/share/doc/${pname} \ - $out/share/${pname}/skins \ + $out/share/doc/free42 \ + $out/share/free42/skins \ $out/share/icons/hicolor/48x48/apps \ $out/share/icons/hicolor/128x128/apps install -m755 gtk/free42dec gtk/free42bin $out/bin - install -m644 gtk/README $out/share/doc/${pname}/README-GTK - install -m644 README $out/share/doc/${pname}/README + install -m644 gtk/README $out/share/doc/free42/README-GTK + install -m644 README $out/share/doc/free42/README install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps install -m644 gtk/icon-128x128.xpm $out/share/icons/hicolor/128x128/apps - install -m644 skins/* $out/share/${pname}/skins + install -m644 skins/* $out/share/free42/skins runHook postInstall ''; - desktopItems = [ - (makeDesktopItem { - name = "com.thomasokken.free42bin"; - desktopName = "Free42Bin"; - genericName = "Calculator"; - exec = "free42bin"; - type = "Application"; - comment = meta.description; - categories = [ "Utility" "Calculator" ]; - }) - (makeDesktopItem { - name = "com.thomasokken.free42dec"; - desktopName = "Free42Dec"; - genericName = "Calculator"; - exec = "free42dec"; - type = "Application"; - comment = meta.description; - categories = [ "Utility" "Calculator" ]; - }) - ]; - - meta = with lib; { + meta = { homepage = "https://github.com/thomasokken/free42"; description = "A software clone of HP-42S Calculator"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ AndersonTorres plabadens ]; - platforms = with platforms; unix; + license = with lib.licenses; [ gpl2Only ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + mainProgram = "free42dec"; + platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/ho/hof/package.nix b/pkgs/by-name/ho/hof/package.nix new file mode 100644 index 000000000000..d5ca54ea5beb --- /dev/null +++ b/pkgs/by-name/ho/hof/package.nix @@ -0,0 +1,40 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "hof"; + version = "0.6.9-beta.1"; + + src = fetchFromGitHub { + owner = "hofstadter-io"; + repo = "hof"; + rev = "v${version}"; + hash = "sha256-4yVP6DRHrsp52VxBhr7qppPhInYEsvPbIfxxQcRwHTw="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + vendorHash = "sha256-cDUcYwcxPn+9TEP5lhVJXofijCZX94Is+Qt41PqUgjI="; + + subPackages = [ "./cmd/hof/main.go" ]; + + postInstall = '' + mv $out/bin/main $out/bin/hof + local INSTALL="$out/bin/hof" + installShellCompletion --cmd hof \ + --bash <($out/bin/hof completion bash) \ + --fish <($out/bin/hof completion fish) \ + --zsh <($out/bin/hof completion zsh) + ''; + + meta = with lib; { + homepage = "https://github.com/hofstadter-io/hof"; + description = "Framework that joins data models, schemas, code generation, and a task engine. Language and technology agnostic"; + license = licenses.asl20; + maintainers = with maintainers; [ jfvillablanca ]; + mainProgram = "hof"; + }; +} diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/by-name/of/offpunk/package.nix similarity index 68% rename from pkgs/applications/networking/browsers/offpunk/default.nix rename to pkgs/by-name/of/offpunk/package.nix index e1b4fdcfa205..e0814a43ef8a 100644 --- a/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/pkgs/by-name/of/offpunk/package.nix @@ -1,14 +1,15 @@ -{ - fetchFromSourcehut, - installShellFiles, - less, - lib, - offpunk, - python3Packages, - testers, - timg, - xdg-utils, - xsel, +{ fetchFromSourcehut +, file +, installShellFiles +, less +, lib +, offpunk +, python3Packages +, testers +, timg +, xdg-utils +, xsel +, }: let @@ -23,6 +24,7 @@ let setproctitle ]; otherDependencies = [ + file less timg xdg-utils @@ -31,7 +33,7 @@ let in python3Packages.buildPythonPackage rec { pname = "offpunk"; - version = "1.10"; + version = "2.0"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.7"; @@ -40,23 +42,21 @@ python3Packages.buildPythonPackage rec { owner = "~lioploum"; repo = "offpunk"; rev = "v${version}"; - hash = "sha256-+jGKPPnKZHn+l6VAwuae6kICwR7ymkYJjsM2OHQAEmU="; + hash = "sha256-6ftc2goCNgvXf5kszvjeSHn24Hn73jq26Irl5jiN6pk="; }; - nativeBuildInputs = [ python3Packages.flit-core installShellFiles ]; + nativeBuildInputs = [ python3Packages.hatchling installShellFiles ]; propagatedBuildInputs = otherDependencies ++ pythonDependencies; postInstall = '' installManPage man/*.1 ''; - passthru.tests.version = testers.testVersion { package = offpunk; }; - meta = with lib; { description = "An Offline-First browser for the smolnet "; homepage = src.meta.homepage; maintainers = with maintainers; [ DamienCassou ]; platforms = platforms.linux; - license = licenses.bsd2; + license = licenses.agpl3Plus; }; } diff --git a/pkgs/by-name/si/signaturepdf/package.nix b/pkgs/by-name/si/signaturepdf/package.nix new file mode 100644 index 000000000000..be7c2fdd308b --- /dev/null +++ b/pkgs/by-name/si/signaturepdf/package.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, php +, makeWrapper +, imagemagick +, librsvg +, potrace +, pdftk +, ghostscript +}: + +stdenv.mkDerivation rec { + pname = "signaturepdf"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "24eme"; + repo = "${pname}"; + rev = "v${version}"; + hash = "sha256-7yhvTxpjxHcmRxTE7avM+dN+yz9iVr8Ea/e2yfkBURA="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/signaturepdf $out/bin + + cp --target-directory=$out/share/signaturepdf --recursive \ + app.php config locale public templates vendor + + makeWrapper ${lib.getExe php} $out/bin/signaturepdf \ + --inherit-argv0 \ + --chdir $out/share/signaturepdf \ + --prefix PATH : ${lib.makeBinPath [ imagemagick librsvg potrace pdftk ghostscript ]} \ + --run 'port=$1' \ + --run '[ $# -ge 1 ] || ( echo "Usage $0 -d upload_max_filesize=24M -d post_max_size=24M -d max_file_uploads=201" >&2 && exit 1 )' \ + --run 'shift' \ + --run 'echo "You may now open a web browser on http://localhost:$port"' \ + --add-flags '-S "localhost:$port" -t public' + + runHook preInstall + ''; + + meta = with lib; { + description = "Web software for signing PDFs and also organize pages, edit metadata and compress pdf"; + homepage = "https://pdf.24eme.fr/"; + changelog = + "https://github.com/24eme/signaturepdf/releases/tag/v${version}"; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ DamienCassou ]; + }; +} diff --git a/pkgs/by-name/so/soundfont-arachno/package.nix b/pkgs/by-name/so/soundfont-arachno/package.nix new file mode 100644 index 000000000000..1bfcad7fdc40 --- /dev/null +++ b/pkgs/by-name/so/soundfont-arachno/package.nix @@ -0,0 +1,27 @@ +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "soundfont-arachno"; + version = "1.0"; + + src = fetchzip { + # Linked on http://www.arachnosoft.com/main/download.php?id=soundfont-sf2: + url = "https://www.dropbox.com/s/2rnpya9ecb9m4jh/arachno-soundfont-${builtins.replaceStrings ["."] [""] version}-sf2.zip"; + hash = "sha256-Z5ETe0AKPCi4KlM2xOlNcyQn1xvCuor3S/tcrF+AwNQ="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + install -Dm444 Arachno*.sf2 $out/share/soundfonts/arachno.sf2 + runHook postInstall + ''; + + meta = with lib; { + description = "General MIDI-compliant bank, aimed at enhancing the realism of your MIDI files and arrangements"; + homepage = "http://www.arachnosoft.com/main/soundfont.php"; + license = licenses.unfree; + platforms = platforms.all; + maintainers = with maintainers; [ mrtnvgr ]; + }; +} diff --git a/pkgs/by-name/sw/sway-audio-idle-inhibit/package.nix b/pkgs/by-name/sw/sway-audio-idle-inhibit/package.nix new file mode 100644 index 000000000000..ae41f6a23684 --- /dev/null +++ b/pkgs/by-name/sw/sway-audio-idle-inhibit/package.nix @@ -0,0 +1,39 @@ +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, pkg-config +, libpulseaudio +, wayland +, wayland-protocols +}: +stdenv.mkDerivation { + pname = "sway-audio-idle-inhibit"; + version = "unstable-2023-08-09"; + + src = fetchFromGitHub { + owner = "ErikReider"; + repo = "SwayAudioIdleInhibit"; + rev = "c850bc4812216d03e05083c69aa05326a7fab9c7"; + sha256 = "sha256-MKzyF5xY0uJ/UWewr8VFrK0y7ekvcWpMv/u9CHG14gs="; + }; + + nativeBuildInputs = [ + meson ninja pkg-config + ]; + + buildInputs = [ + libpulseaudio wayland wayland-protocols + ]; + + meta = with lib; { + description = "Prevents swayidle from sleeping while any application is outputting or receiving audio"; + homepage = "https://github.com/ErikReider/SwayAudioIdleInhibit"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ rafaelrc ]; + mainProgram = "sway-audio-idle-inhibit"; + }; +} + diff --git a/pkgs/by-name/sw/sway-overfocus/package.nix b/pkgs/by-name/sw/sway-overfocus/package.nix new file mode 100644 index 000000000000..08b6158d4f11 --- /dev/null +++ b/pkgs/by-name/sw/sway-overfocus/package.nix @@ -0,0 +1,30 @@ +{ fetchFromGitHub, lib, nix-update-script, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "sway-overfocus"; + version = "0.2.3-fix"; + + src = fetchFromGitHub { + owner = "korreman"; + repo = pname; + rev = "v${version}"; + hash = "sha256-KHbYlxgrrZdNKJ7R9iVflbbP1c6qohM/NHBSYuzxEt4="; + }; + + cargoHash = "sha256-zp6PSu8P+ZUhrqi5Vxpe+z9zBaSkdVQBMGNP0FVOviQ="; + + # Crate without tests. + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = ''"Better" focus navigation for sway and i3.''; + homepage = "https://github.com/korreman/sway-overfocus"; + changelog = "https://github.com/korreman/sway-overfocus/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = [ maintainers.ivan770 ]; + mainProgram = "sway-overfocus"; + }; +} + diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index b344ca0d4aad..c7ca80ccb008 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20231012"; + version = "20231112"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-KXmHaoIZ01M6Nu2LlVgTZarUp+5VPpLfnkc7d/Xl4z0="; + sha256 = "sha256-CTygf2/CbxNO/9e8OfxeGZFaSrKXdlQdvUgywZX1U9o="; }; dontUnpack = true; diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index c297ec27a3a9..f2946f499202 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -1,7 +1,6 @@ { lib , stdenvNoCC , fetchFromGitHub -, fetchpatch , nix-update-script , gettext , meson @@ -12,24 +11,15 @@ stdenvNoCC.mkDerivation rec { pname = "elementary-gtk-theme"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = "stylesheet"; rev = version; - sha256 = "sha256-ZR0FJ8DkPlO1Zatvxv3NghAVBPo2j+1m0k4C+gvYPVA="; + sha256 = "sha256-KrpeDQH43n7seeSPVYKETxy1g0JuUowZerjgktLQg/4="; }; - patches = [ - # Headerbars: fix missing default-decoration - # https://github.com/elementary/stylesheet/pull/1258 - (fetchpatch { - url = "https://github.com/elementary/stylesheet/commit/9cea2383bec8f90d25f1e9b854b5221737487521.patch"; - sha256 = "sha256-6komROS4+nxwoGoKoiDmnrTfLNZAvnTU6hIEOQQfmxc="; - }) - ]; - nativeBuildInputs = [ gettext meson diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix index b9d3dd80a23c..2c2600845b24 100644 --- a/pkgs/desktops/plasma-5/discover.nix +++ b/pkgs/desktops/plasma-5/discover.nix @@ -8,7 +8,6 @@ , flatpak , fwupd , ostree -, packagekit-qt , pcre , util-linux , qtquickcontrols2 @@ -42,7 +41,6 @@ mkDerivation { flatpak fwupd ostree - packagekit-qt pcre util-linux qtquickcontrols2 diff --git a/pkgs/development/compilers/llvm/7/lldb/default.nix b/pkgs/development/compilers/llvm/7/lldb/default.nix index 0a0aa3be18a1..02e3cdcb8eb9 100644 --- a/pkgs/development/compilers/llvm/7/lldb/default.nix +++ b/pkgs/development/compilers/llvm/7/lldb/default.nix @@ -52,7 +52,11 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc - darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.Foundation + darwin.bootstrap_cmds + darwin.apple_sdk.frameworks.Carbon + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.DebugSymbols ]; CXXFLAGS = "-fno-rtti"; diff --git a/pkgs/development/interpreters/cel-go/default.nix b/pkgs/development/interpreters/cel-go/default.nix index d45abd4c0f4a..821e8da2ee34 100644 --- a/pkgs/development/interpreters/cel-go/default.nix +++ b/pkgs/development/interpreters/cel-go/default.nix @@ -5,24 +5,18 @@ buildGoModule rec { pname = "cel-go"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "google"; repo = "cel-go"; rev = "v${version}"; - hash = "sha256-eXltZkg5QjdCrL9sk2ngVtirSnjBBqk+OdNLY4QtVx4="; + hash = "sha256-c4MVOHkDaUGlRVYb9YS9BH4ld2zS3SR5efP6amLhTig="; }; modRoot = "repl"; - vendorHash = "sha256-kalTHpyMYrKZHayxNKLc8vtogiDKyyQLExOQhqp1MUY="; - - patches = [ - # repl/go.mod and repl/go.sum are outdated - # ran `go mod tidy` in the repl directory - ./go-mod-tidy.patch - ]; + vendorHash = "sha256-Oj/XUUmuj5scD5WT6zBxnU1hSapDyRBBz75rbIdY4Ho="; subPackages = [ "main" diff --git a/pkgs/development/interpreters/cel-go/go-mod-tidy.patch b/pkgs/development/interpreters/cel-go/go-mod-tidy.patch deleted file mode 100644 index a1f4f06ae834..000000000000 --- a/pkgs/development/interpreters/cel-go/go-mod-tidy.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/repl/go.mod -+++ b/repl/go.mod -@@ -6,16 +6,16 @@ require ( - github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1 - github.com/chzyer/readline v1.5.1 - github.com/google/cel-go v0.14.0 -- google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 -- google.golang.org/protobuf v1.30.0 -+ google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 -+ google.golang.org/protobuf v1.31.0 - ) - - require ( - github.com/stoewer/go-strcase v1.3.0 // indirect - golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect -- golang.org/x/sys v0.7.0 // indirect -+ golang.org/x/sys v0.8.0 // indirect - golang.org/x/text v0.9.0 // indirect -- google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect -+ google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect - ) - - replace github.com/google/cel-go => ../. ---- a/repl/go.sum -+++ b/repl/go.sum -@@ -26,18 +26,18 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o - golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= - golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= - golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= --golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= - golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= - golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= --google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 h1:m8v1xLLLzMe1m5P+gCTF8nJB9epwZQUBERm20Oy1poQ= --google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 h1:0nDDozoAU19Qb2HwhXadU8OcsiO/09cnTqhUtq2MEOM= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= -+google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 h1:nIgk/EEq3/YlnmVVXVnm14rC2oxgs1o0ong4sD/rd44= -+google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q= -+google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 h1:eSaPbMR4T7WfH9FvABk36NBMacoTUKdWCvV0dx+KfOg= -+google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I= - google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= --google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= --google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= - gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/pkgs/development/interpreters/expr/default.nix b/pkgs/development/interpreters/expr/default.nix index be783c6a0410..cda9cc7b78e8 100644 --- a/pkgs/development/interpreters/expr/default.nix +++ b/pkgs/development/interpreters/expr/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "expr"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "antonmedv"; repo = "expr"; rev = "v${version}"; - hash = "sha256-r+XlcDvCQarzh8wO3NL87PJThnioeVC73OZdJ8kW4RM="; + hash = "sha256-x96I6HHhm3RIrlg1/KVCIbFkelazGt0H2nk8juUWjKg="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-WxYqP8L64U5MAYG7XTpKrRW1aaqGB4hJr+e/RKdb1lU="; + vendorHash = "sha256-ZVB6P0WdjyDK9OlEgKjR3D3IVBkDbDx9bOpLC/H2JLs="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts_py2.py b/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts_py2.py new file mode 100644 index 000000000000..bb82900c65a9 --- /dev/null +++ b/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts_py2.py @@ -0,0 +1,30 @@ +import pkg_resources +import collections +import sys + +do_abort = False +packages = collections.defaultdict(list) + +for f in sys.path: + for req in pkg_resources.find_distributions(f): + if req not in packages[req.project_name]: + # some exceptions inside buildPythonPackage + if req.project_name in ['setuptools', 'pip', 'wheel']: + continue + packages[req.project_name].append(req) + + +for name, duplicates in packages.items(): + if len(duplicates) > 1: + do_abort = True + print("Found duplicated packages in closure for dependency '{}': ".format(name)) + for dup in duplicates: + print(" " + repr(dup)) + +if do_abort: + print("") + print( + 'Package duplicates found in closure, see above. Usually this ' + 'happens if two packages depend on different version ' + 'of the same dependency.') + sys.exit(1) diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index f7cc10274ae3..0a4600b9d6c3 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -106,9 +106,16 @@ in { pythonCatchConflictsHook = callPackage ({ makePythonHook, setuptools }: makePythonHook { name = "python-catch-conflicts-hook"; - substitutions = { + substitutions = let + useLegacyHook = lib.versionOlder python.version "3.10"; + in { inherit pythonInterpreter pythonSitePackages; - catchConflicts=../catch_conflicts/catch_conflicts.py; + catchConflicts = if useLegacyHook then + ../catch_conflicts/catch_conflicts_py2.py + else + ../catch_conflicts/catch_conflicts.py; + } // lib.optionalAttrs useLegacyHook { + inherit setuptools; }; } ./python-catch-conflicts-hook.sh) {}; diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix index 6d51b51b215d..1a6f9c784cf6 100644 --- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix @@ -57,8 +57,7 @@ # Raise an error if two packages are installed with the same name # TODO: For cross we probably need a different PYTHONPATH, or not # add the runtime deps until after buildPhase. -# FIXME: disabled for Python 2 because broken -, catchConflicts ? false +, catchConflicts ? (python.stdenv.hostPlatform == python.stdenv.buildPlatform) # Additional arguments to pass to the makeWrapper function, which wraps # generated binaries. diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index fc7e541ceff6..66ee788ca430 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-IWOgbKYaWKjC2+dc2P3THAVy23F3iQXh2D6od/0e0Jw="; + sha256 = "sha256-QVUnn9G28epoUEcK8mwm8S2wDQ/tv5B3Zds7bTUFwlw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/ada/xmlada/default.nix b/pkgs/development/libraries/ada/xmlada/default.nix index e80371e092e8..77e8094277a7 100644 --- a/pkgs/development/libraries/ada/xmlada/default.nix +++ b/pkgs/development/libraries/ada/xmlada/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "xmlada"; - version = "23.0.0"; + version = "24.0.0"; src = fetchFromGitHub { name = "xmlada-${version}-src"; owner = "AdaCore"; repo = "xmlada"; rev = "v${version}"; - sha256 = "sha256-covcSwlQQjRKTv0DdMEgahXXlch0TeKnvSyOsGO9+e0="; + sha256 = "sha256-vvM7bdf3dAa3zKgxbGeAGlBT6fvafzmleimJHyRdlvc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index c9f6711780b0..801ad7979aee 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-UG/vV/6WxVLq9mdze8pSDFJIekOgGsg93dzMq6eP6Dg="; + hash = "sha256-QFK8mEMcqQwALFNvAdD8yWixwMYHSbeo6xqx86PvejU="; }; patches = [ ./version.patch ]; diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index ca7a47d36385..73bc80ef9d5b 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.89.9"; + version = "1.90"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-0k9jKrJUrG9piHNFQaBBY3zgNIKM23ZA879NY+MNYTU="; + sha256 = "sha256-rJMWCPVhho34NcPvJZaB5d6EbZkJyLXEfeotplOOaiA="; }; dontBuild = true; diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index 9755d0977c85..a2822eae8d54 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -1,30 +1,51 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome }: +{ stdenv +, lib +, fetchurl +, autoreconfHook +, pkg-config +, intltool +, gtk-doc +, glib +, avahi +, gnutls +, libuuid +, libsoup +, gtk3 +, gnome +}: -let - avahiWithGtk = avahi.override { gtk3Support = true; }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libepc"; version = "0.4.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/libepc/${lib.versions.majorMinor finalAttrs.version}/libepc-${finalAttrs.version}.tar.xz"; sha256 = "1s3svb2slqjsrqfv50c2ymnqcijcxb5gnx6bfibwh9l5ga290n91"; }; + patches = [ + # Remove dependency that is only needed by uninstalled examples. + ./no-avahi-ui.patch + ]; + nativeBuildInputs = [ + autoreconfHook + gnome.gnome-common pkg-config intltool gtk-doc ]; + buildInputs = [ glib libuuid gtk3 ]; + propagatedBuildInputs = [ - avahiWithGtk + avahi gnutls libsoup ]; @@ -33,7 +54,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libepc"; versionPolicy = "odd-unstable"; }; }; @@ -45,4 +66,4 @@ in stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/libepc/no-avahi-ui.patch b/pkgs/development/libraries/libepc/no-avahi-ui.patch new file mode 100644 index 000000000000..4649ecbe27ce --- /dev/null +++ b/pkgs/development/libraries/libepc/no-avahi-ui.patch @@ -0,0 +1,36 @@ +diff --git a/Makefile.am b/Makefile.am +index acf0d25..13022d1 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -32,8 +32,6 @@ noinst_PROGRAMS = \ + examples/lookup-resource \ + examples/service-browser \ + examples/simple-publisher \ +- examples/consumer-ui \ +- examples/publisher-ui \ + examples/server-credentials \ + $(TESTS) + TESTS = \ +@@ -155,10 +153,6 @@ examples_service_browser_LDADD = $(example_epc_libs) + examples_simple_publisher_CFLAGS = $(example_epc_cflags) + examples_simple_publisher_LDADD = $(example_epc_libs) + +-examples_consumer_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) +-examples_consumer_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS) +-examples_publisher_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) -rdynamic +-examples_publisher_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS) + examples_server_credentials_CFLAGS = $(example_epc_ui_cflags) + examples_server_credentials_LDADD = $(example_epc_ui_libs) + +diff --git a/configure.ac b/configure.ac +index d68bf94..89bd471 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -53,7 +53,6 @@ PKG_CHECK_EXISTS([$GIO_REQUIREMENT], + GIO=$GIO_REQUIREMENT], + [AC_MSG_RESULT([no])]) + +-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= 0.6]) + PKG_CHECK_MODULES(LIBEPC, [avahi-client >= 0.6 + avahi-glib >= 0.6 + glib-2.0 >= 2.36 diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index 455d42c3bb45..16c98abf4417 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Extensible spatial index library in C++"; homepage = "https://libspatialindex.org"; license = licenses.mit; + maintainers = teams.geospatial.members; platforms = platforms.unix; }; }) diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index e6bf2a4c5496..2518cecb9b6c 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -9,13 +9,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "3.3"; + version = "3.3.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-dC4Z1OvqIF8YhuSeVo+E0CohdXYIfkeTEw3/QuYA/90="; + hash = "sha256-br2ssI4MRk9O6u+5voBmxBZtmTFPKoJJe3ZEN2blq7Y="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 5ac49ac278fc..53a5e09413c5 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.4.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-d1tJJCHbx+7klS918Db7S2N8zCdvd9MhI5ybxJpncUw="; + sha256 = "sha256-g1jrjRls9tJWh0koMg7MsUgRSNaty8YI+ivlwL6FCsk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index f6c49b9cfb69..63a86ed55b52 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -11,6 +11,7 @@ , gexiv2 , tracker , meson +, mesonEmulatorHook , ninja , pkg-config , vala @@ -68,6 +69,7 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_45 gettext + glib itstool libxslt meson @@ -75,6 +77,8 @@ stdenv.mkDerivation rec { pkg-config vala wrapGAppsNoGuiHook + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; # TODO: add libenca, libosinfo @@ -83,7 +87,6 @@ stdenv.mkDerivation rec { dbus exempi giflib - glib gexiv2 totem-pl-parser tracker diff --git a/pkgs/development/perl-modules/CSSDOM-replace-apostrophe.patch b/pkgs/development/perl-modules/CSSDOM-replace-apostrophe.patch new file mode 100644 index 000000000000..54bc7f8dd3b9 --- /dev/null +++ b/pkgs/development/perl-modules/CSSDOM-replace-apostrophe.patch @@ -0,0 +1,1412 @@ +commit 7dda09313a63c4c64563f582844d7b04302d94bd +Author: Yves Orton +Date: Wed Feb 22 13:28:01 2023 +0100 + + Replace apostrophe with :: as package separator + + In 5.37.9 this is deprecated, and in 5.40 it will be forbidden + +diff --git a/lib/CSS/DOM/Parser.pm b/lib/CSS/DOM/Parser.pm +index 473992c..d688f19 100644 +--- a/lib/CSS/DOM/Parser.pm ++++ b/lib/CSS/DOM/Parser.pm +@@ -369,7 +369,7 @@ sub _parse_at_rule { for (shift) { for my $tokens (shift) { + + $selector =~ s/s\z// and pop @selector; + +- require CSS'DOM'Rule; ++ require CSS::DOM::Rule; + (my $rule = new CSS::DOM::Rule $_[0]||()) + ->_set_tokens( + $selector,\@selector +@@ -413,7 +413,7 @@ sub _parse_at_rule { for (shift) { for my $tokens (shift) { + my ($types,@tokens) = ("\@$1",$at,splice @$tokens,0,$+[0]); + $types =~ /"/ and return; # ignore rules w/invalid strings + $types =~ s/s\z// and pop @tokens; +- require CSS'DOM'Rule; ++ require CSS::DOM::Rule; + (my $rule = new CSS::DOM::Rule $_[0]||()) + ->_set_tokens( + $types, \@tokens +diff --git a/lib/CSS/DOM/PropertyParser.pm b/lib/CSS/DOM/PropertyParser.pm +index 258158f..76b0d99 100644 +--- a/lib/CSS/DOM/PropertyParser.pm ++++ b/lib/CSS/DOM/PropertyParser.pm +@@ -6,8 +6,8 @@ use warnings; no warnings qw 'utf8 parenthesis'; + use strict; + + use constant 1.03 (); # multiple +-use CSS::DOM'Constants ':primitive', ':value'; +-use CSS'DOM'Util; ++use CSS::DOM::Constants ':primitive', ':value'; ++use CSS::DOM::Util; + + use constant old_perl => $] < 5.01; + { no strict 'refs'; delete ${__PACKAGE__.'::'}{old_perl} } +@@ -19,7 +19,7 @@ use constant old_perl => $] < 5.01; + use constant naughty_perl => 0+$] eq 5.01; + { no strict 'refs'; delete ${__PACKAGE__.'::'}{naughty_perl} } + +-*s2c = *CSS'DOM'Constants'SuffixToConst; ++*s2c = *CSS::DOM::Constants::SuffixToConst; + our %s2c; + + our %compiled; # compiled formats +@@ -60,7 +60,7 @@ sub clone { + # exists &dclone or require Storable, "Storable"->import('dclone'); + # return dclone($_[0]); + require Clone; +- return Clone'clone($_[0]); ++ return Clone::clone($_[0]); + } + + # Declare the variables that the re-evals use. Some nasty hacker went and +@@ -202,7 +202,7 @@ sub _make_arg_list { + my($stypes,$stokens) = _space_out($types, $tokens); + my $css = join "", @$stokens; + if(@_ == 1) { # list property +- my $list = shift @'_; ++ my $list = shift @_; + my $sep = @$list <= 1 ? '' : do { + my $range_start = $$list[0][4]; + my $range_end = $$list[1][4] - length($$list[1][4]) - 1; +@@ -301,7 +301,7 @@ sub _make_arg_list { + + sub _space_out { + my($types,$tokens) = @_; +-Carp'cluck() if ref $tokens ne 'ARRAY'; ++Carp::cluck() if ref $tokens ne 'ARRAY'; + $tokens = [@$tokens]; + my @posses; + $types =~ s/(?<=[^(f])(?![),]|\z)/ +@@ -328,7 +328,7 @@ sub _prep_val { + } + else { + require CSS::DOM::Parser; +- ($types, $tokens) = CSS::DOM::Parser'tokenise($_[0]); ++ ($types, $tokens) = CSS::DOM::Parser::tokenise($_[0]); + } + + # strip out all whitespace tokens +diff --git a/lib/CSS/DOM/Rule.pm b/lib/CSS/DOM/Rule.pm +index 921efb0..666fb08 100644 +--- a/lib/CSS/DOM/Rule.pm ++++ b/lib/CSS/DOM/Rule.pm +@@ -46,7 +46,7 @@ sub _parse { # This method parses the code passed to it and checks to see + # the rule data from the new rule. + my $self = shift; + require CSS::DOM::Parser; +- my $new_rule = CSS::DOM::Parser'parse_statement(shift) ++ my $new_rule = CSS::DOM::Parser::parse_statement(shift) + || die CSS::DOM::Exception->new(SYNTAX_ERR, $@); + + ref $new_rule eq ref $self or die CSS::DOM::Exception->new( +diff --git a/lib/CSS/DOM/Rule/Import.pm b/lib/CSS/DOM/Rule/Import.pm +index 1afdcdc..75c8505 100644 +--- a/lib/CSS/DOM/Rule/Import.pm ++++ b/lib/CSS/DOM/Rule/Import.pm +@@ -45,7 +45,7 @@ sub cssText { + sub href { + my $self =shift; + $self->[hrfe] ||= do { +- require CSS'DOM'Parser; ++ require CSS::DOM::Parser; + if($self->[urlt][00] eq 'u') { + # ~~~ I probably ought to put things like this in a + # Parser::token_val function. +@@ -53,10 +53,10 @@ sub href { + $url =~ s/^url\([ \t\r\n\f]*//; + $url =~ s/[ \t\r\n\f]*\)\z//; + $url =~ s/^['"]// and chop $url; +- CSS'DOM'Parser'unescape($url); ++ CSS::DOM::Parser::unescape($url); + } + else { +- CSS'DOM'Parser'unescape( ++ CSS::DOM::Parser::unescape( + substr $$self[urlt][1], 1, -1 + ) + } +diff --git a/lib/CSS/DOM/Rule/Style.pm b/lib/CSS/DOM/Rule/Style.pm +index dfa7501..54da057 100644 +--- a/lib/CSS/DOM/Rule/Style.pm ++++ b/lib/CSS/DOM/Rule/Style.pm +@@ -93,8 +93,8 @@ sub _selector_matches { # ~~~ Does this work with initial space in the selector? + + # tokenise if necessary + unless(ref $self->[selc]) { +- require CSS'DOM'Parser; +- $self->[selc] = [ CSS'DOM'tokenise($self->[selc]) ]; ++ require CSS::DOM::Parser; ++ $self->[selc] = [ CSS::DOM::tokenise($self->[selc]) ]; + } + + # parse selector tokens if necessary +@@ -130,7 +130,7 @@ sub _selector_matches { # ~~~ Does this work with initial space in the selector? + + # ids: + if($types =~ s/^#//) { +- push @subsel, '#', CSS'DOM'Util'unescape( substr shift @tokens, 1 ), ++ push @subsel, '#', CSS::DOM::Util::unescape( substr shift @tokens, 1 ), + undef; + } + +@@ -138,12 +138,12 @@ sub _selector_matches { # ~~~ Does this work with initial space in the selector? + elsif($types =~ /^di/ && $tokens[0] eq '.') { + $types =~ s/^..//; shift @tokens; + push @subsel, '~', 'class', +- CSS'DOM'Util'unescape( shift @tokens ); ++ CSS::DOM::Util::unescape( shift @tokens ); + } + + # pseudo-elems and classes + elsif($types =~ s/^(::?)i//) { +- push @subsel, $1,lc CSS'DOM'Util'unescape($tokens[length $1]), undef; ++ push @subsel, $1,lc CSS::DOM::Util::unescape($tokens[length $1]), undef; + splice @tokens, 0, $+[0]; + } + +@@ -151,14 +151,14 @@ sub _selector_matches { # ~~~ Does this work with initial space in the selector? + elsif($types =~ s/^:fi\)//) { + push @subsel, + ':', +- lc CSS'DOM'Util'unescape(substr $tokens[1], 0, -1), +- lc CSS'DOM'Util'unescape($tokens[2]); ++ lc CSS::DOM::Util::unescape(substr $tokens[1], 0, -1), ++ lc CSS::DOM::Util::unescape($tokens[2]); + splice @tokens, 0, 4; + } + + # [attr] + elsif($types =~ s/^\[i]//) { +- push @subsel, '=', lc CSS'DOM'Util'unescape($tokens[1]), undef; ++ push @subsel, '=', lc CSS::DOM::Util::unescape($tokens[1]), undef; + splice @tokens, 0, 3; + } + +@@ -166,16 +166,16 @@ sub _selector_matches { # ~~~ Does this work with initial space in the selector? + elsif($types =~ /^\[id']/ && $tokens[2] eq '=') { + $types =~ s/^.{5}//; + push @subsel, '=', +- lc CSS'DOM'Util'unescape($tokens[1]), +- CSS'DOM'Util'unescape_str($tokens[3]); ++ lc CSS::DOM::Util::unescape($tokens[1]), ++ CSS::DOM::Util::unescape_str($tokens[3]); + splice @tokens, 0, 5; + } + + # [attr~='value'], [attr|='value'] + elsif($types =~ s/^\[i[~|]']//) { + push @subsel, $tokens[2], +- lc CSS'DOM'Util'unescape($tokens[1]), +- CSS'DOM'Util'unescape_str($tokens[3]); ++ lc CSS::DOM::Util::unescape($tokens[1]), ++ CSS::DOM::Util::unescape_str($tokens[3]); + splice @tokens, 0, 5; + } + +diff --git a/lib/CSS/DOM/Style.pm b/lib/CSS/DOM/Style.pm +index 47d1291..b42b8db 100644 +--- a/lib/CSS/DOM/Style.pm ++++ b/lib/CSS/DOM/Style.pm +@@ -171,9 +171,9 @@ sub setProperty { + # short-circuit for the common case + length $value or $self->removeProperty($name),return; + +- require CSS'DOM'Parser; +- my @tokens = eval { CSS'DOM'Parser'tokenise_value($value); } +- or die CSS::DOM'Exception->new( SYNTAX_ERR, $@); ++ require CSS::DOM::Parser; ++ my @tokens = eval { CSS::DOM::Parser::tokenise_value($value); } ++ or die CSS::DOM::Exception->new( SYNTAX_ERR, $@); + + # check for whitespace/comment assignment + $tokens[0] =~ /^s+\z/ and $self->removeProperty($name),return; +diff --git a/lib/CSS/DOM/Value.pm b/lib/CSS/DOM/Value.pm +index 45f89e9..83b04e7 100644 +--- a/lib/CSS/DOM/Value.pm ++++ b/lib/CSS/DOM/Value.pm +@@ -7,9 +7,9 @@ use strict; + + use Carp; + use CSS::DOM::Constants; +-use CSS'DOM'Exception 'NO_MODIFICATION_ALLOWED_ERR'; ++use CSS::DOM::Exception 'NO_MODIFICATION_ALLOWED_ERR'; + use Exporter 5.57 'import'; +-use Scalar'Util < weaken reftype >; ++use Scalar::Util < weaken reftype >; + + use constant 1.03 our $_const = { + type => 0, +@@ -46,11 +46,11 @@ sub cssText { + ? $self->[valu] : 'inherit' + if defined wantarray; + if(@_) { +- die new CSS'DOM'Exception ++ die new CSS::DOM::Exception + NO_MODIFICATION_ALLOWED_ERR, + "Unowned value objects cannot be modified" + unless my $owner = $self->[ownr]; +- die new CSS'DOM'Exception ++ die new CSS::DOM::Exception + NO_MODIFICATION_ALLOWED_ERR, + "CSS::DOM::Value objects that do not know to which " + ."property they belong cannot be modified" +diff --git a/lib/CSS/DOM/Value/List.pm b/lib/CSS/DOM/Value/List.pm +index 85f5ef5..e681fa2 100644 +--- a/lib/CSS/DOM/Value/List.pm ++++ b/lib/CSS/DOM/Value/List.pm +@@ -2,8 +2,8 @@ package CSS::DOM::Value::List; + + $VERSION = '0.17'; + +-use CSS'DOM'Constants ; +-use Scalar'Util 'weaken'; ++use CSS::DOM::Constants ; ++use Scalar::Util 'weaken'; + + # Object of this class are hashes, with the following keys: + # c: CSS code +@@ -14,7 +14,7 @@ use Scalar'Util 'weaken'; + + sub DOES { + return 1 if $_[1] eq 'CSS::DOM::Value'; +- goto &UNIVERSAL'DOES if defined &UNIVERSAL'DOES; ++ goto &UNIVERSAL::DOES if defined &UNIVERSAL::DOES; + } + + use overload +@@ -37,14 +37,14 @@ sub cssText { + if(defined wantarray) {{ + if(!defined $$self{c} || grep ref ne 'ARRAY', @{$$self{v}}) { + @{$$self{v}} or $old = 'none', last; +- require CSS'DOM'Value'Primitive; ++ require CSS::DOM::Value::Primitive; + my @args; my $index = 0; + for(@{$$self{v}}) { + next unless ref eq 'ARRAY'; + @args or @args = ( + (owner => property => @$self{})[0,2,1,3], index => $index + ); +- $_ = new CSS'DOM'Value'Primitive @$_, @args; ++ $_ = new CSS::DOM::Value::Primitive @$_, @args; + } + no warnings 'uninitialized'; + $old = join length $$self{s} ? $$self{s} : ' ', +@@ -53,11 +53,11 @@ sub cssText { + else { $old = $$self{c} } + }} + if(@_) { # assignment +- die new CSS'DOM'Exception ++ die new CSS::DOM::Exception + NO_MODIFICATION_ALLOWED_ERR, + "Unowned value objects cannot be modified" + unless my $owner = $self->{o}; +- die new CSS'DOM'Exception ++ die new CSS::DOM::Exception + NO_MODIFICATION_ALLOWED_ERR, + "CSS::DOM::Value objects that do not know to which " + ."property they belong cannot be modified" +@@ -67,8 +67,8 @@ sub cssText { + my @arsg + = $owner->property_parser->match($prop, $_[0]) + ) { +- require CSS'DOM'Value; +- CSS'DOM'Value::_apply_args_to_self($self,$owner,$prop,@arsg); ++ require CSS::DOM::Value; ++ CSS::DOM::Value::_apply_args_to_self($self,$owner,$prop,@arsg); + } + + if(my $mh = $owner->modification_handler) { +@@ -89,8 +89,8 @@ sub item { + defined or return; + ref eq 'ARRAY' or return exit die return $_; + +- require CSS'DOM'Value'Primitive; +- return $_ = new CSS'DOM'Value'Primitive ++ require CSS::DOM::Value::Primitive; ++ return $_ = new CSS::DOM::Value::Primitive + @$_, + (owner => property => @$self{})[0,2,1,3], + index => $index; +diff --git a/lib/CSS/DOM/Value/Primitive.pm b/lib/CSS/DOM/Value/Primitive.pm +index 2ce0e9d..2046ff4 100644 +--- a/lib/CSS/DOM/Value/Primitive.pm ++++ b/lib/CSS/DOM/Value/Primitive.pm +@@ -17,7 +17,7 @@ use Exporter 5.57 'import'; + + sub DOES { + return 1 if $_[1] eq 'CSS::DOM::Value'; +- goto &UNIVERSAL'DOES if defined &UNIVERSAL'DOES; ++ goto &UNIVERSAL::DOES if defined &UNIVERSAL::DOES; + } + + use constant 1.03 our $_const = { # Don’t conflict with the superclass! +@@ -203,8 +203,8 @@ sub cssText { + }} + } + if(@_) { +- require CSS'DOM'Exception, +- die new CSS'DOM'Exception ++ require CSS::DOM::Exception, ++ die new CSS::DOM::Exception + NO_MODIFICATION_ALLOWED_ERR, + "Unowned value objects cannot be modified" + unless my $owner = $self->[ownr]; +@@ -213,15 +213,15 @@ sub cssText { + # deal with formats + if(my $format = $$self[form]) { + if(!our $parser) { +- require CSS'DOM'PropertyParser; ++ require CSS::DOM::PropertyParser; + add_property{ +- $parser = new CSS'DOM'PropertyParser ++ $parser = new CSS::DOM::PropertyParser + } _=>our $prop_spec = {}; + } + our $prop_spec->{format} = $format; + if(my @args = match { our $parser } _=> shift) { +- require CSS'DOM'Value; +- CSS'DOM'Value'_apply_args_to_self( ++ require CSS::DOM::Value; ++ CSS::DOM::Value::_apply_args_to_self( + $self, $owner, $prop, + @args, format => $format, + ); +@@ -231,8 +231,8 @@ sub cssText { + # This is never reached, at least not when CSS::DOM’s mod- + # ules call the constructor: + elsif(!defined $prop) { +- require CSS'DOM'Exception, +- die new CSS'DOM'Exception ++ require CSS::DOM::Exception, ++ die new CSS::DOM::Exception + NO_MODIFICATION_ALLOWED_ERR, + ref($self) . " objects that do not know to which " + ."property they belong cannot be modified" +@@ -263,8 +263,8 @@ sub cssText { + $index+1..$length-1 + ), + ); +- require CSS'DOM'Value; +- CSS'DOM'Value'_load_if_necessary($arsg[1]); ++ require CSS::DOM::Value; ++ CSS::DOM::Value::_load_if_necessary($arsg[1]); + my $list = $arsg[1]->new( + owner => $owner, + property => $prop, +@@ -284,8 +284,8 @@ sub cssText { + my @arsg + = $owner->property_parser->match($prop, $_[0]) + ) { +- require CSS'DOM'Value; +- CSS'DOM'Value'_apply_args_to_self( ++ require CSS::DOM::Value; ++ CSS::DOM::Value::_apply_args_to_self( + $self, $owner, $prop, @arsg + ); + } +@@ -341,10 +341,10 @@ sub cssValueType { CSS::DOM::Value::CSS_PRIMITIVE_VALUE } + sub primitiveType { shift->[type] } + + sub setFloatValue { +- my ($self,$type,$val) = @'_; ++ my ($self,$type,$val) = @_; + +- require CSS'DOM'Exception, +- die new CSS'DOM'Exception INVALID_ACCESS_ERR, "Invalid value type" ++ require CSS::DOM::Exception, ++ die new CSS::DOM::Exception INVALID_ACCESS_ERR, "Invalid value type" + if $type == CSS_UNKNOWN || $type == CSS_COUNTER + || $type == CSS_RECT || $type == CSS_RGBCOLOR || $type == CSS_DIMENSION; + +@@ -352,8 +352,8 @@ sub setFloatValue { + # using this API. + no warnings 'numeric'; + $self->cssText(my $css = _serialise($type, $val)); +- require CSS'DOM'Exception, +- die new CSS'DOM'Exception INVALID_ACCESS_ERR, "Invalid value: $css" ++ require CSS::DOM::Exception, ++ die new CSS::DOM::Exception INVALID_ACCESS_ERR, "Invalid value: $css" + if $self->cssText ne $css; + _: + } +@@ -364,8 +364,8 @@ sub getFloatValue { + # There are more types that are numbers than are not, so we + # invert our list. + my $type = $self->[type]; +- require CSS'DOM'Exception, +- die new CSS'DOM'Exception INVALID_ACCESS_ERR, "Not a numeric value" ++ require CSS::DOM::Exception, ++ die new CSS::DOM::Exception INVALID_ACCESS_ERR, "Not a numeric value" + if $type == CSS_UNKNOWN || $type == CSS_STRING || $type == CSS_URI + || $type == CSS_IDENT || $type == CSS_ATTR || $type == CSS_COUNTER + || $type == CSS_RECT || $type == CSS_RGBCOLOR; +@@ -380,8 +380,8 @@ sub getStringValue { + my $self = shift; + + my $type = $self->[type]; +- require CSS'DOM'Exception, +- die new CSS'DOM'Exception INVALID_ACCESS_ERR, "Not a string value" ++ require CSS::DOM::Exception, ++ die new CSS::DOM::Exception INVALID_ACCESS_ERR, "Not a string value" + unless $type == CSS_STRING || $type == CSS_URI + || $type == CSS_IDENT || $type == CSS_ATTR; + +diff --git a/t/CSS2Properties.t b/t/CSS2Properties.t +index 315321b..13fc438 100644 +--- a/t/CSS2Properties.t ++++ b/t/CSS2Properties.t +@@ -3,8 +3,8 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; +-sub tests'import { $tests += pop if @_ > 1 }; ++sub tests::VERSION { $tests += pop }; ++sub tests::import { $tests += pop if @_ > 1 }; + use Test::More; + plan tests => $tests; + +diff --git a/t/CSSCharsetRule.t b/t/CSSCharsetRule.t +index 92a8e74..fc3dba5 100644 +--- a/t/CSSCharsetRule.t ++++ b/t/CSSCharsetRule.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -13,7 +13,7 @@ use_ok 'CSS::DOM::Rule::Charset',; + + require CSS::DOM; + my $rule = ( +- my $ss = CSS::DOM'parse( ++ my $ss = CSS::DOM::parse( + '@charset "utf-8";' + ) + )-> cssRules->[0]; +diff --git a/t/CSSFontFaceRule.t b/t/CSSFontFaceRule.t +index 9f4879e..abd5b6c 100644 +--- a/t/CSSFontFaceRule.t ++++ b/t/CSSFontFaceRule.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -13,7 +13,7 @@ use_ok 'CSS::DOM::Rule::FontFace',; + + require CSS::DOM; + my $rule = ( +- my $ss = CSS::DOM'parse( ++ my $ss = CSS::DOM::parse( + '@font-face { font-family: "foo";src:url(bar) }' + ) + )-> cssRules->[0]; +diff --git a/t/CSSImportRule.t b/t/CSSImportRule.t +index 6ec65ef..c8a6a51 100644 +--- a/t/CSSImportRule.t ++++ b/t/CSSImportRule.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -15,7 +15,7 @@ use_ok 'CSS::DOM::Rule::Import'; + + require CSS::DOM; + my $rule = ( +- my $ss = CSS::DOM'parse( ++ my $ss = CSS::DOM::parse( + '@import "foo.css" tv, screen' + ) + )-> cssRules->[0]; +@@ -95,7 +95,7 @@ use tests 5; # styleSheet + 'foo.css' => '@import "bar.css"', + 'bar.css' => 'a { color: blue }', + ); +- is CSS'DOM'parse('@import "foo.css',url_fetcher=>sub{$urls{$_[0]}}) ++ is CSS::DOM::parse('@import "foo.css',url_fetcher=>sub{$urls{$_[0]}}) + ->cssRules->[0]->styleSheet + ->cssRules->[0]->styleSheet + ->cssRules->[0]->style->color, +diff --git a/t/CSSMediaRule.t b/t/CSSMediaRule.t +index fffa7fb..9d01698 100644 +--- a/t/CSSMediaRule.t ++++ b/t/CSSMediaRule.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -15,7 +15,7 @@ use_ok 'CSS::DOM::Rule::Media'; + + require CSS::DOM; + my $rule = ( +- my $ss = CSS::DOM'parse( ++ my $ss = CSS::DOM::parse( + '@media print { body { background: none } }' + ) + )-> cssRules->[0]; +@@ -133,4 +133,4 @@ use tests 4; # deleteRule + cmp_ok $@, '==', CSS::DOM::Exception::INDEX_SIZE_ERR, + 'error raised by deleteRule'; + +-} +\ No newline at end of file ++} +diff --git a/t/CSSPageRule.t b/t/CSSPageRule.t +index 108923e..764e1a1 100644 +--- a/t/CSSPageRule.t ++++ b/t/CSSPageRule.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -14,7 +14,7 @@ use_ok 'CSS::DOM::Rule::Page',; + + require CSS::DOM; + my $rule = ( +- my $ss = CSS::DOM'parse( '@page:first{ margin-top: 3in }') ++ my $ss = CSS::DOM::parse( '@page:first{ margin-top: 3in }') + )-> cssRules->[0]; + + use tests 1; # isa +diff --git a/t/CSSPrimitiveValue.t b/t/CSSPrimitiveValue.t +index 5b30046..ad378f7 100644 +--- a/t/CSSPrimitiveValue.t ++++ b/t/CSSPrimitiveValue.t +@@ -4,8 +4,8 @@ use strict; use warnings; + no warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; +-sub tests'import { $tests += pop if @_ > 1 }; ++sub tests::VERSION { $tests += pop }; ++sub tests::import { $tests += pop if @_ > 1 }; + use Test::More; + plan tests => $tests; + +@@ -441,9 +441,9 @@ for(CSS::DOM::Value::Primitive->new( + # ------------------------------------------ + # Tests for setFloatValue and setStringValue + +-use CSS'DOM'Style; ++use CSS::DOM::Style; + require CSS::DOM::PropertyParser; +-my $s = new CSS'DOM'Style ++my $s = new CSS::DOM::Style + property_parser => $CSS::DOM::PropertyParser::Default; + + for my $meth ('setFloatValue' ,'setStringValue'){ +diff --git a/t/CSSRule.t b/t/CSSRule.t +index b33007c..582eb04 100644 +--- a/t/CSSRule.t ++++ b/t/CSSRule.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -24,7 +24,7 @@ use tests 7; # constants + + + require CSS::DOM; +-my $ss = CSS::DOM'parse( 'a{text-decoration: none} p { margin: 0 }'); ++my $ss = CSS::DOM::parse( 'a{text-decoration: none} p { margin: 0 }'); + my $rule = cssRules $ss ->[0]; + + use tests 1; # isa +diff --git a/t/CSSRuleList.t b/t/CSSRuleList.t +index bc2bfaf..5cee6f6 100644 +--- a/t/CSSRuleList.t ++++ b/t/CSSRuleList.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +diff --git a/t/CSSStyleDeclaration-setProperty.t b/t/CSSStyleDeclaration-setProperty.t +index cceb993..d0615b7 100644 +--- a/t/CSSStyleDeclaration-setProperty.t ++++ b/t/CSSStyleDeclaration-setProperty.t +@@ -7,7 +7,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +diff --git a/t/CSSStyleDeclaration.t b/t/CSSStyleDeclaration.t +index 57bfe98..7bcc370 100644 +--- a/t/CSSStyleDeclaration.t ++++ b/t/CSSStyleDeclaration.t +@@ -3,7 +3,7 @@ + use strict; use warnings; no warnings qw 'utf8 parenthesis regexp once qw'; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -26,7 +26,7 @@ use tests 3; # first make sure we can use it without loading CSS::DOM + + + require CSS::DOM; +-my $ss = CSS::DOM'parse ('a{text-decoration: none} p { margin: 0 }'); ++my $ss = CSS::DOM::parse ('a{text-decoration: none} p { margin: 0 }'); + my $rule = cssRules $ss ->[0]; + my $decl = $rule->style; + +@@ -105,7 +105,7 @@ like $decl->cssText, qr/color: blue !very\\ important/, + + use tests 4; # length + { +- my $decl = new CSS'DOM'Style; ++ my $decl = new CSS::DOM::Style; + is eval { $decl->length }, 0, # This used to die [RT #54810] + 'length when no properties have been added'; # (fixed in 0.09). + $decl = CSS::DOM::Style::parse( +diff --git a/t/CSSStyleRule.t b/t/CSSStyleRule.t +index 024012b..fb550da 100644 +--- a/t/CSSStyleRule.t ++++ b/t/CSSStyleRule.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -14,7 +14,7 @@ use_ok 'CSS::DOM::Rule::Style',; + + require CSS::DOM; + my $rule = ( +- my $ss = CSS::DOM'parse('a{text-decoration: none} p { margin: 0 }') ++ my $ss = CSS::DOM::parse('a{text-decoration: none} p { margin: 0 }') + )-> cssRules->[0]; + + use tests 1; # isa +diff --git a/t/CSSStyleSheet-insertRule.t b/t/CSSStyleSheet-insertRule.t +index 3302966..94b3ee7 100644 +--- a/t/CSSStyleSheet-insertRule.t ++++ b/t/CSSStyleSheet-insertRule.t +@@ -7,7 +7,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -19,4 +19,3 @@ ok eval{$ss->insertRule('a{ color: red }',0);1}, + 'insertRule on empty style sheet doesn\'t die'; + # At one point during development, it did die because it was call- + # ing methods on CSS::DOM::RuleParser which hadn’t been loaded. +- +diff --git a/t/CSSStyleSheet.t b/t/CSSStyleSheet.t +index ab82e6a..40b3edf 100644 +--- a/t/CSSStyleSheet.t ++++ b/t/CSSStyleSheet.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -30,7 +30,7 @@ use tests 3; # (_set_)ownerRule + + use tests 2; # cssRules + { +- $ss = CSS::DOM'parse( 'a{text-decoration: none} p { margin: 0 }'); ++ $ss = CSS::DOM::parse( 'a{text-decoration: none} p { margin: 0 }'); + is +()=$ss->cssRules, 2, 'cssRules in list context'; + isa_ok my $rules = cssRules $ss, 'CSS::DOM::RuleList', + 'cssRules in scalar context'; +@@ -38,7 +38,7 @@ use tests 2; # cssRules + + use tests 11; # insertRule + { +- $ss = CSS::DOM'parse ('a{text-decoration: none} p { margin: 0 }'); ++ $ss = CSS::DOM::parse ('a{text-decoration: none} p { margin: 0 }'); + + is $ss->insertRule('b { font-weight: bold }', 0), 0, + 'retval of insertRule'; +@@ -70,7 +70,7 @@ use tests 11; # insertRule + + use tests 4; # deleteRule + { +- $ss = CSS::DOM'parse ('a{text-decoration: none} p { margin: 0 } ++ $ss = CSS::DOM::parse ('a{text-decoration: none} p { margin: 0 } + i {}'); + is +()=$ss->deleteRule(1), 0, 'retval of deleteRule'; + is_deeply [map $_->selectorText, $ss->cssRules], [qw/ a i /], +@@ -82,4 +82,4 @@ use tests 4; # deleteRule + cmp_ok $@, '==', CSS::DOM::Exception::INDEX_SIZE_ERR, + 'error raised by deleteRule'; + +-} +\ No newline at end of file ++} +diff --git a/t/CSSValue-prim-cssText.t b/t/CSSValue-prim-cssText.t +index 09f657b..b19836a 100644 +--- a/t/CSSValue-prim-cssText.t ++++ b/t/CSSValue-prim-cssText.t +@@ -6,7 +6,7 @@ + use strict; use warnings; no warnings qw 'qw regexp once utf8 parenthesis'; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +diff --git a/t/CSSValue.t b/t/CSSValue.t +index 5fad855..f5a04d0 100644 +--- a/t/CSSValue.t ++++ b/t/CSSValue.t +@@ -3,7 +3,7 @@ + use strict; use warnings; no warnings qw 'qw regexp once utf8 parenthesis'; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -38,7 +38,7 @@ isa_ok +CSS::DOM::Value->new(type => &CSS_CUSTOM, value => "top left"), + + require CSS::DOM::Style; + require CSS::DOM::PropertyParser; +-my $s = new CSS'DOM'Style ++my $s = new CSS::DOM::Style + property_parser => my $spec = $CSS::DOM::PropertyParser::Default; + + # The default parser has no properties with a simple string, attr or +diff --git a/t/CSSValueList.t b/t/CSSValueList.t +index 1805209..25c1bec 100644 +--- a/t/CSSValueList.t ++++ b/t/CSSValueList.t +@@ -3,17 +3,17 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +-use CSS'DOM'Constants ':primitive'; +-use CSS'DOM'Value'List; ++use CSS::DOM::Constants ':primitive'; ++use CSS::DOM::Value::List; + + use tests 1; # DOES +-ok +CSS'DOM'Value'List->DOES('CSS::DOM::Value'), 'DOES'; ++ok +CSS::DOM::Value::List->DOES('CSS::DOM::Value'), 'DOES'; + +-my $v = new CSS'DOM'Value'List values => [ ++my $v = new CSS::DOM::Value::List values => [ + [ type => CSS_STRING, value => 'sphed' ], + [ type => CSS_STRING, value => 'flit' ], + ]; +diff --git a/t/MediaList.t b/t/MediaList.t +index 3092c62..0888d61 100644 +--- a/t/MediaList.t ++++ b/t/MediaList.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +diff --git a/t/RGBColor.t b/t/RGBColor.t +index 3758529..12d2938 100644 +--- a/t/RGBColor.t ++++ b/t/RGBColor.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +diff --git a/t/Rect.t b/t/Rect.t +index e7f83a4..ea8f046 100644 +--- a/t/Rect.t ++++ b/t/Rect.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -25,4 +25,4 @@ use tests 4; + is $v->left->cssText, '4cm', 'left'; + } + +-# ~~~ test for modifications of the cssText property +\ No newline at end of file ++# ~~~ test for modifications of the cssText property +diff --git a/t/StyleSheet.t b/t/StyleSheet.t +index a4469fb..e84e7d4 100644 +--- a/t/StyleSheet.t ++++ b/t/StyleSheet.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -55,7 +55,7 @@ use tests 1; # (set_)href + + use tests 1; # title + { +- sub foo'attr { return shift->{+shift} } ++ sub foo::attr { return shift->{+shift} } + $ss->set_ownerNode(my $foo = bless {title => 'tilde'}, 'foo'); + is $ss->title, 'tilde', 'title'; + } +diff --git a/t/StyleSheetList.t b/t/StyleSheetList.t +index 8e8c7cf..745f894 100644 +--- a/t/StyleSheetList.t ++++ b/t/StyleSheetList.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +diff --git a/t/charset.t b/t/charset.t +index eed053e..1666157 100644 +--- a/t/charset.t ++++ b/t/charset.t +@@ -3,7 +3,7 @@ + use strict; use warnings; no warnings qw 'utf8 parenthesis'; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +diff --git a/t/css-dom-interface.t b/t/css-dom-interface.t +index 41bca29..76e5f2f 100644 +--- a/t/css-dom-interface.t ++++ b/t/css-dom-interface.t +@@ -6,7 +6,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +diff --git a/t/css-dom-style.t b/t/css-dom-style.t +index f852f6f..9a6582f 100644 +--- a/t/css-dom-style.t ++++ b/t/css-dom-style.t +@@ -6,13 +6,13 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + + use tests 4; # modification_handler + require CSS::DOM::Style; +-my $style = CSS::DOM::Style'parse('margin-top: 2px'); ++my $style = CSS::DOM::Style::parse('margin-top: 2px'); + $style->modification_handler(sub { ++$}; ${{} .= shift}); + $style->cssText('margin-bottom: 600%'); + is $}, 1, 'cssText triggers mod hander'; +@@ -25,4 +25,3 @@ is $}, 3, 'AUTOLOAD triggers the handler'; + # ~~~ We also needs tests for modification_handler triggered by: + # • removeProperty + # • modifications to CSSValue objects and their sub-objects (RGBColor etc +- +diff --git a/t/css-dom-util.t b/t/css-dom-util.t +index 5dbef09..554cd1b 100644 +--- a/t/css-dom-util.t ++++ b/t/css-dom-util.t +@@ -3,7 +3,7 @@ + use strict; use warnings; no warnings qw 'utf8 parenthesis'; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +diff --git a/t/css-dom.t b/t/css-dom.t +index e36a046..d43d458 100644 +--- a/t/css-dom.t ++++ b/t/css-dom.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -28,7 +28,7 @@ use tests 1; # compute_style + local $SIG{__WARN__} = sub { $w .= shift }; + require CSS::DOM::Style; + my $elem = bless{ +- style => CSS'DOM'Style'parse('color:red'), tagName => 'p', ++ style => CSS::DOM::Style::parse('color:red'), tagName => 'p', + }, MyElem=>; + CSS::DOM::compute_style(element => $elem); + is $w, undef, 'no warnings for style belonging to element itself'; +diff --git a/t/parser-rules.t b/t/parser-rules.t +index 16cb536..7387caf 100644 +--- a/t/parser-rules.t ++++ b/t/parser-rules.t +@@ -8,7 +8,7 @@ + use strict; use warnings; no warnings qw 'utf8 parenthesis'; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -35,7 +35,7 @@ use tests 2; # miscellaneous CSS::DOM::parse stuff + + use tests 7; # + { +- my $sheet = CSS'DOM'parse ' ++ my $sheet = CSS::DOM::parse ' + /* /**/ + @at-rule {/* +@@ -46,9 +46,9 @@ use tests 7; # + '@at-rule {/*'; +- CSS'DOM'parse 'a { --> }'; ++ CSS::DOM::parse 'a { --> }'; + ok $@, 'invalid -->'; +- CSS'DOM'parse 'a { a { }');1}, + 'invalid --> before statement'; +@@ -62,7 +62,7 @@ use tests 7; # + + use tests 5; # single statement parser + { +- my $sheet = new CSS'DOM; ++ my $sheet = new CSS::DOM; + $sheet->insertRule('phoo { bar : baz} ',0); + isa_ok cssRules$sheet->[0], 'CSS::DOM::Rule::Style', + 'ruleset created by insertRule'; +@@ -79,36 +79,36 @@ use tests 5; # single statement parser + + use tests 9; # styledecl parser + { +- my $style = CSS'DOM'Style'parse ' foo : bar '; ++ my $style = CSS::DOM::Style::parse ' foo : bar '; + is $style->cssText, 'foo: bar', 'style parser'; +- CSS'DOM'Style'parse 'foo: bar}'; ++ CSS::DOM::Style::parse 'foo: bar}'; + ok $@, 'style parser chokes on }'; +- is CSS'DOM'Style'parse ' ; ;;;;;foo : bar ;;;; ; ',->cssText, ++ is CSS::DOM::Style::parse ' ; ;;;;;foo : bar ;;;; ; ',->cssText, + 'foo: bar', 'style wit extra semicolons'; +- is CSS'DOM'Style'parse 'foo:bar',->cssText, ++ is CSS::DOM::Style::parse 'foo:bar',->cssText, + 'foo: bar', 'style with no space'; +- is CSS'DOM'Style'parse 'foo:bar;;;baz:bonk;;',->cssText, ++ is CSS::DOM::Style::parse 'foo:bar;;;baz:bonk;;',->cssText, + 'foo: bar; baz: bonk', + 'style with no space & extra semicolons'; +- is CSS'DOM'Style'parse 'foo:bar;;;!baz:bonk;;',->cssText, ++ is CSS::DOM::Style::parse 'foo:bar;;;!baz:bonk;;',->cssText, + 'foo: bar', + 'style with delimiter+ident for property name'; +- is CSS'DOM'Style'parse '\70\41 dding:0;;;;;',->cssText, ++ is CSS::DOM::Style::parse '\70\41 dding:0;;;;;',->cssText, + 'padding: 0', + 'style with escaped property name'; + +- is CSS'DOM'Style'parse '\a\z\A\Z\)\a a :bar', ++ is CSS::DOM::Style::parse '\a\z\A\Z\)\a a :bar', + ->getPropertyValue("\nz\nZ)\na"), 'bar', + 'style with both kinds of ident escapes'; + + { package Phoo; use overload '""'=>sub{'foo:bar'}} +- is CSS'DOM'Style'parse(bless [], 'Phoo')->cssText, 'foo: bar', ++ is CSS::DOM::Style::parse(bless [], 'Phoo')->cssText, 'foo: bar', + '::Style::parse\'s force stringification'; + } + + use tests 121; # @media + { +- my $sheet = new CSS'DOM; my $rule; ++ my $sheet = new CSS::DOM; my $rule; + + $sheet->insertRule('@media print{a{color:blue}}',0); + isa_ok $rule=pop@{$sheet->cssRules}, 'CSS::DOM::Rule::Media', +@@ -464,7 +464,7 @@ use tests 121; # @media + is $rule->cssText, "\@meDIa { }\n", + 'serialised empty unclosed fake @meDIa rule w/ws'; + +- $sheet = CSS'DOM'parse ' ++ $sheet = CSS::DOM::parse ' + @media print { a { color: blue } "stuff"} + td { padding: 0 } + '; +@@ -496,7 +496,7 @@ use tests 121; # @media + + use tests 1; # bracket closure + { +- my $sheet = new CSS'DOM; my $rule; ++ my $sheet = new CSS::DOM; my $rule; + + $sheet->insertRule('@unknown {(rect([',0); + is +($rule=pop@{$sheet->cssRules})->cssText, +@@ -506,7 +506,7 @@ use tests 1; # bracket closure + + use tests 14; # @page + { +- my $sheet = new CSS'DOM; my $rule; ++ my $sheet = new CSS::DOM; my $rule; + + $sheet->insertRule('@page{color:blue}',0); + is +($rule=pop@{$sheet->cssRules})->type, PAGE_RULE, +@@ -553,7 +553,7 @@ use tests 14; # @page + + use tests 6; # unrecognised at-rules + { +- my $sheet = new CSS'DOM; my $rule; ++ my $sheet = new CSS::DOM; my $rule; + + $sheet->insertRule('@unknown \ / \ / :-P {...}',0); + is +($rule=pop@{$sheet->cssRules})->type, UNKNOWN_RULE, +@@ -579,7 +579,7 @@ use tests 6; # unrecognised at-rules + + use tests 6; # ruselet pasrer + { +- my $sheet = new CSS'DOM; my $rule; ++ my $sheet = new CSS::DOM; my $rule; + + $sheet->insertRule('a{text-decoration:none;color:blue}',0); + is +($rule=pop@{$sheet->cssRules})->type, STYLE_RULE, +@@ -605,7 +605,7 @@ use tests 6; # ruselet pasrer + + use tests 1; # invaldi strings + { +- my $sheet = CSS'DOM'parse q* ++ my $sheet = CSS::DOM::parse q* + p { + color: green; + font-family: 'Courier New Times +@@ -634,51 +634,51 @@ use tests 1; # invaldi strings + + use tests 10; # invalid closing brackets + { +- is CSS'DOM'parse q" @eotetet ]" =>-> cssRules->length,0, ++ is CSS::DOM::parse q" @eotetet ]" =>-> cssRules->length,0, + 'invalid closing bracket in unknown rule'; + ok $@, '$@ is set by invalid closing bracket in unknown rule'; +- is CSS'DOM'parse q" @media { ]" =>-> cssRules->length, 0, ++ is CSS::DOM::parse q" @media { ]" =>-> cssRules->length, 0, + 'invalid closing bracket in media rule'; + ok $@, '$@ is set by invalid closing bracket in media rule'; +- is CSS'DOM'parse q" @page { ]" =>-> cssRules->length, 0, ++ is CSS::DOM::parse q" @page { ]" =>-> cssRules->length, 0, + 'invalid closing bracket in page rule'; + ok $@, '$@ is set by invalid closing bracket in page rule'; +- is CSS'DOM'parse q" page ( ]" =>-> cssRules->length, 0, ++ is CSS::DOM::parse q" page ( ]" =>-> cssRules->length, 0, + 'invalid closing bracket in selector'; + ok $@, '$@ is set by invalid closing bracket in selector'; +- is CSS'DOM'parse q" a { (}" =>-> cssRules->length, 0, ++ is CSS::DOM::parse q" a { (}" =>-> cssRules->length, 0, + 'invalid closing bracket in style declaration'; + ok $@, '$@ is set by invalid closing bracket in selector'; + } + + use tests 14; # invalid [\@;] + { +- is CSS'DOM'parse q" @eotetet @aa ]" =>-> cssRules->length,0, ++ is CSS::DOM::parse q" @eotetet @aa ]" =>-> cssRules->length,0, + 'invalid @ in unknown rule'; + ok $@, '$@ is set by invalid @ in unknown rule'; +- is CSS'DOM'parse q" @eotetet aa (;" =>-> cssRules->length,0, ++ is CSS::DOM::parse q" @eotetet aa (;" =>-> cssRules->length,0, + 'invalid ; in unknown rule'; + ok $@, '$@ is set by invalid ; in unknown rule'; +- is CSS'DOM'parse q" @media {(; { " =>-> cssRules->length,0, ++ is CSS::DOM::parse q" @media {(; { " =>-> cssRules->length,0, + 'invalid ; in media rule'; + ok $@, '$@ is set by invalid ; in media rule'; +- is CSS'DOM'parse q" @page { (;fooo" =>-> cssRules->length,0, ++ is CSS::DOM::parse q" @page { (;fooo" =>-> cssRules->length,0, + 'invalid ; in page rule'; + ok $@, '$@ is set by invalid ; in page rule'; +- is CSS'DOM'parse q" page @oo " =>-> cssRules->length,0, ++ is CSS::DOM::parse q" page @oo " =>-> cssRules->length,0, + 'invalid @ in selector'; + ok $@, '$@ is set by invalid @ in selector'; +- is CSS'DOM'parse q" page ;( " =>-> cssRules->length,0, ++ is CSS::DOM::parse q" page ;( " =>-> cssRules->length,0, + 'invalid ; in selector'; + ok $@, '$@ is set by invalid ; in selector'; +- is CSS'DOM'parse q" a { ( ;( " =>-> cssRules->length,0, ++ is CSS::DOM::parse q" a { ( ;( " =>-> cssRules->length,0, + 'invalid ; in style declaration'; + ok $@, '$@ is set by invalid ; in style declaration'; + } + + use tests 14; # @import + { +- my $sheet = new CSS'DOM; my $rule; ++ my $sheet = new CSS::DOM; my $rule; + + $sheet->insertRule('@import"foo.css"print,screen;',0); + is +($rule=pop@{$sheet->cssRules})->type, IMPORT_RULE, +@@ -722,7 +722,7 @@ use tests 14; # @import + + use tests 8; # @font-face + { +- my $sheet = new CSS'DOM; my $rule; ++ my $sheet = new CSS::DOM; my $rule; + + $sheet->insertRule('@font-face{color:blue}',0); + is +($rule=pop@{$sheet->cssRules})->type, FONT_FACE_RULE, +@@ -751,7 +751,7 @@ use tests 8; # @font-face + + use tests 13; # @charset + { +- my $sheet = new CSS'DOM; my $rule; ++ my $sheet = new CSS::DOM; my $rule; + + $sheet->insertRule('@charset "utf-8";',0); + is +($rule=pop@{$sheet->cssRules})->type, CHARSET_RULE, +@@ -799,4 +799,3 @@ use tests 13; # @charset + is +($rule=pop@{$sheet->cssRules})->type, UNKNOWN_RULE, + '@charset w/space b4 ; is an unknown rule'; + } +- +diff --git a/t/parser-tokens.t b/t/parser-tokens.t +index 9c0fae3..d6a42b7 100644 +--- a/t/parser-tokens.t ++++ b/t/parser-tokens.t +@@ -3,7 +3,7 @@ + use strict; use warnings; no warnings qw 'utf8 parenthesis'; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -37,7 +37,7 @@ for('_', 'a'..'z', 'A'.."Z", map(chr,0x80..0x100) ,"\x{2003}","\x{3000}"){ + { + my $style = CSS::DOM::Style::parse("--a: 65"); + is $style->cssText, '', 'identifier can\'t begin with --'; +- $style = CSS'DOM'Style'parse"-0b:-0b"; ++ $style = CSS::DOM::Style::parse"-0b:-0b"; + is $style->cssText, '', 'nor with -0'; + } + +@@ -49,7 +49,7 @@ use tests 8; # strings + . q/\'\"/; + my $expect = + qq/ \x{10ffff}f-_abcABC}}}}}}}}\xff\x{2003}\x{100}\t'"/; +- my $rule = new CSS::DOM::Rule'Import; ++ my $rule = new CSS::DOM::Rule::Import; + + $rule->cssText('@import ' . "'$nasty_escaped_string'"); + is $rule->href, $expect, "'...'"; +@@ -80,7 +80,7 @@ use tests 8; # strings + + use tests 23; # urls + { +- my $rule = new CSS'DOM'Rule::Import; ++ my $rule = new CSS::DOM::Rule::Import; + + $rule->cssText('@import url(!$#%&][\\\}|{*~foo/bar.gif)'); + is $rule->href, '!$#%&][\}|{*~foo/bar.gif', 'unquoted url'; +@@ -118,7 +118,7 @@ use tests 23; # urls + is $rule->href, "\x{2000}\x{2000}\n 0 )\tz", + 'double-quoted url with escapes'; + +- my $style = new CSS'DOM'Style; ++ my $style = new CSS::DOM::Style; + + $style->name('url(foo'); + is $style->name, 'url(foo)', 'unquoted, unterminated url'; +@@ -179,7 +179,7 @@ use tests 3; # spaces and comments + "name:valu /*eeeee " + ); + is $style->name, 'valu', 'another ws /**/ test'; +- $style = CSS'DOM'Style'parse( "name: /*\n*/valu"); ++ $style = CSS::DOM::Style::parse( "name: /*\n*/valu"); + is $style->name, 'valu', 'multiline comments'; + } + +@@ -187,27 +187,27 @@ use tests 3; # spaces and comments + + use tests 6; # + { +- my $sheet = CSS'DOM'parse ' @media print{}'; ++ my $sheet = CSS::DOM::parse ' @media print{}'; + is join('',map cssText$_,cssRules$sheet), + "{ name: value }\n\@media print {\n}\n", + 'ignored '; +- is CSS'DOM'parse"{}{name: value; n:v}" =>-> ++ is CSS::DOM::parse"{}{name: --> value; n:v}" =>-> + cssRules->length, + 1, + 'invalid -->'; + ok $@, '$@ after invalid -->'; +- is CSS'DOM'Style'parse"name:'",->name, ++ is CSS::DOM::Style::parse"name:'",->name, + "''", ' in a string'; + } + + use tests 1; # miscellaneous tokens + { +- my $sheet = CSS'DOM'parse '@foo ()[~=:,./+-]{[("\"'; ++ my $sheet = CSS::DOM::parse '@foo ()[~=:,./+-]{[("\"'; + is $sheet->cssRules->[0]->cssText, + '@foo ()[~=:,./+-]{[("\"")]}'. "\n", + 'miscellaneous tokens' +diff --git a/t/property-parser.t b/t/property-parser.t +index 6423b39..f785054 100644 +--- a/t/property-parser.t ++++ b/t/property-parser.t +@@ -3,7 +3,7 @@ + use strict; use warnings; no warnings qw 'utf8 parenthesis regexp once qw'; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -18,11 +18,11 @@ isa_ok my $parser = CSS::DOM::PropertyParser->new, + + use tests 4; # clone + my $clone = (my $css21 = $CSS::DOM::PropertyParser::CSS21)->clone; +-isn't $clone, $css21, 'clone at the first level'; +-isn't $clone->get_property('background-position'), ++isnt $clone, $css21, 'clone at the first level'; ++isnt $clone->get_property('background-position'), + $css21->get_property('background-position'), + 'clone clones individual property specs'; +-isn't ++isnt + $clone->get_property('border-color')->{properties} + {'border-top-color'}, + $css21->get_property('border-color')->{properties} +@@ -1314,17 +1314,17 @@ use tests 2; # parsing colours + { # Tests for problems with colours in cygwin’s perl (broken in 0.08; fixed + # in 0.09) and for bugs temporarily introduced while those problems were + # being addressed. +- my $p = new CSS'DOM'PropertyParser; ++ my $p = new CSS::DOM::PropertyParser; + $p->add_property( + 'colours' => { + format => '+', + }, + ); +- my $s = CSS'DOM'Style'parse( ++ my $s = CSS::DOM::Style::parse( + "colours: rgb(0,0,0) rgb(1,1,1)", + property_parser => $p + ); +- use CSS'DOM'Constants 'CSS_CUSTOM'; ++ use CSS::DOM::Constants 'CSS_CUSTOM'; + is $s->getPropertyCSSValue('colours')->cssValueType, CSS_CUSTOM, + 'quantified s'; + $p->add_property( +@@ -1346,18 +1346,18 @@ use tests 1; # backtracking with list properties + # local ${$whatever}[0] localises one element. But it actually + # replaces the array temporarily with a new one, which cannot + # work with references. +- my $p = new CSS'DOM'PropertyParser; ++ my $p = new CSS::DOM::PropertyParser; + $p->add_property( + 'foo' => { + format => '[(foo)|(foo),]+', # [(foo),?]+ does not trigger the bug + list => 1, + }, + ); +- my $s = CSS'DOM'Style'parse( ++ my $s = CSS::DOM::Style::parse( + "foo: foo, foo", + property_parser => $p + ); +- use CSS'DOM'Constants 'CSS_VALUE_LIST'; ++ use CSS::DOM::Constants 'CSS_VALUE_LIST'; + is_deeply [map cssText $_, @{$s->getPropertyCSSValue('foo')}],[('foo')x2], + 'backtracking does not preserve existing captures'; + } diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index d1dc513c0b0b..b22090a7593d 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "18.4.1"; + version = "18.5.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-o1Yv4/wSM2k+L2/JP3teUj129QlyLjoShCRWJ3lIN98="; + hash = "sha256-kj4FHsNsGsMxK+EI1jgqBfvldkyAoBkCTGT1yiZMmzY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index af7635184a0d..463518ef2f98 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,8 +17,8 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.5.2"; - format = "pyproject"; + version = "5.5.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-ioFTayuPkxXIaaKKVHBLyU47jID6dGWCX1G9kVkD5Yo="; + hash = "sha256-6kfkHLW5PftzrhKjywc670HpKCrrU0POEiJ3u2doBTk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 01e1593a82ce..5832d9a06933 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , fetchNpmDeps , buildPythonPackage +, nix-update-script # build-system , gettext @@ -19,14 +20,14 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.4.1"; + version = "3.4.2"; format = "setuptools"; src = fetchFromGitHub { owner = "django-hijack"; repo = "django-hijack"; rev = "refs/tags/${version}"; - hash = "sha256-y8KT/Fbk2eQDbGzcJtLdwS6jPCNoTWXousvqY+GlFnQ="; + hash = "sha256-E5gM/5MIB65gdyv/I+Kuw8rbjPvtUnbCPXpasaIDzyo="; }; postPatch = '' @@ -39,7 +40,7 @@ buildPythonPackage rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-FLfMCn2jsLlTTsC+LRMX0dmVCCbNAr2pQUsSQRKgo6E="; + hash = "sha256-4ZVb+V/oYfflIZdme6hbpoSBFVV7lk5wLfEzzBqZv/Y="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -67,6 +68,9 @@ buildPythonPackage rec { "-W" "ignore::DeprecationWarning" ]; + # needed for npmDeps update + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Allows superusers to hijack (=login as) and work on behalf of another user"; homepage = "https://github.com/arteria/django-hijack"; diff --git a/pkgs/development/python-modules/echo/default.nix b/pkgs/development/python-modules/echo/default.nix new file mode 100644 index 000000000000..af3a3d43a6d7 --- /dev/null +++ b/pkgs/development/python-modules/echo/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, setuptools-scm +, libxcrypt +, numpy +, qt6 +, qtpy +, pyqt6 +, pytestCheckHook +, pytest-cov +}: + +buildPythonPackage rec { + pname = "echo"; + version = "0.8.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "glue-viz"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-0FmUA7kOFSRZXwbj8d7asujBPOjE2pFhu6TDNSGD4r0="; + }; + + nativeBuildInputs = [ setuptools setuptools-scm qt6.wrapQtAppsHook ]; + + buildInputs = lib.optionals (pythonOlder "3.9") [ + libxcrypt + ]; + + propagatedBuildInputs = [ + qt6.qtconnectivity + qt6.qtbase + qt6.qttools + pyqt6 + numpy + qtpy + ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + # collecting ... qt.qpa.xcb: could not connect to display + # qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found. + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov + ]; + + pythonImportsCheck = [ "echo" ]; + + meta = with lib; { + homepage = "https://github.com/glue-viz/echo"; + description = "Callback Properties in Python"; + license = licenses.mit; + maintainers = with maintainers; [ ifurther ]; + }; +} diff --git a/pkgs/development/python-modules/fast-histogram/default.nix b/pkgs/development/python-modules/fast-histogram/default.nix new file mode 100644 index 000000000000..fd00ff5df8e2 --- /dev/null +++ b/pkgs/development/python-modules/fast-histogram/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, pytestCheckHook +, fetchFromGitHub +, python +, pythonOlder +, setuptools +, setuptools-scm +, numpy +, wheel +, hypothesis +, pytest-cov +}: + +buildPythonPackage rec { + pname = "fast-histogram"; + version = "0.12"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "astrofrog"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Cz4BgbtxbUPxL2NSzvZYjbYIN4KUuliUV0bXRRtyvfM="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + propagatedBuildInputs = [ numpy ]; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + pytest-cov + ]; + + pytestFlagsArray = [ "${builtins.placeholder "out"}/${python.sitePackages}" ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + pythonImportsCheck = [ "fast_histogram" ]; + + meta = with lib; { + homepage = "https://github.com/astrofrog/fast-histogram"; + description = "Fast 1D and 2D histogram functions in Python"; + license = licenses.bsd2; + maintainers = with maintainers; [ ifurther ]; + }; +} diff --git a/pkgs/development/python-modules/glueviz/default.nix b/pkgs/development/python-modules/glueviz/default.nix new file mode 100644 index 000000000000..c6fb2859b413 --- /dev/null +++ b/pkgs/development/python-modules/glueviz/default.nix @@ -0,0 +1,87 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, dill +, astropy +, numpy +, pandas +, qt6 +, pyqt6 +, pyqt-builder +, qtconsole +, setuptools +, setuptools-scm +, scipy +, ipython +, ipykernel +, h5py +, matplotlib +, xlrd +, mpl-scatter-density +, pvextractor +, openpyxl +, echo +, pytest +, pytest-flakes +, pytest-cov +}: + +buildPythonPackage rec { + pname = "glueviz"; + version = "1.14.1"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "glue-viz"; + repo = "glue"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-pHUcvyDziE7l0foEz7cygMuAwggnIWzsQy9SFZCDkXA="; + }; + + buildInputs = [ pyqt-builder ]; + nativeBuildInputs = [ setuptools setuptools-scm qt6.wrapQtAppsHook ]; + propagatedBuildInputs = [ + astropy + dill + setuptools + scipy + numpy + matplotlib + pandas + pyqt6 + qtconsole + ipython + ipykernel + h5py + xlrd + mpl-scatter-density + pvextractor + openpyxl + echo + ]; + + dontConfigure = true; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + # collecting ... qt.qpa.xcb: could not connect to display + # qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found. + doCheck = false; + + nativeCheckInputs = [ pytest pytest-flakes pytest-cov ]; + + pythonImportsCheck = [ "glue" ]; + + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + meta = with lib; { + homepage = "https://glueviz.org"; + description = "Linked Data Visualizations Across Multiple Files"; + license = licenses.bsd3; # https://github.com/glue-viz/glue/blob/main/LICENSE + maintainers = with maintainers; [ ifurther ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 2aa7834ace8a..2e91f2704c77 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.8.2"; + version = "1.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SJpjS72keOf9QF1imsWLbgMSzxCDloO4tuc4vUy8ZBk="; + hash = "sha256-VU+vB+x2DElwzl1cO7qTdV91Mn1i2Dsq2safnMrwuqI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index 336f8ed962c3..1e460fa3c7fa 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.31.0"; + version = "1.32.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hF+gptNLAeLtpZGrwOezwFeihDt1smCp4QkK5lENMHo="; + hash = "sha256-vX85fDFNGJ8zJe6YCPn7VFOdvPkT35VbM3Do+cP2b/Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/imgtool/default.nix b/pkgs/development/python-modules/imgtool/default.nix new file mode 100644 index 000000000000..88ceeb233706 --- /dev/null +++ b/pkgs/development/python-modules/imgtool/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, cbor2 +, click +, cryptography +, intelhex +}: + +buildPythonPackage rec { + pname = "imgtool"; + version = "1.10.0"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-A7NOdZNKw9lufEK2vK8Rzq9PRT98bybBfXJr0YMQS0A="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + cbor2 + click + cryptography + intelhex + ]; + + pythonImportsCheck = [ + "imgtool" + ]; + + meta = with lib; { + description = "MCUboot's image signing and key management"; + homepage = "https://github.com/mcu-tools/mcuboot"; + license = licenses.asl20; + maintainers = with maintainers; [ samueltardieu ]; + }; +} diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix index e03e005ad7b2..65d5f064ce57 100644 --- a/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/pkgs/development/python-modules/lightning-utilities/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.9.0"; + version = "0.10.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-vSeHtvsIt4L4qJCVlTPVjIjd62+08JWBnr9+9+ujOfw="; + hash = "sha256-lp/+ArgoMIa7Q2ufWghr8OYUMlFcj8123Et73ORNI5U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/linknlink/default.nix b/pkgs/development/python-modules/linknlink/default.nix new file mode 100644 index 000000000000..59c02c466093 --- /dev/null +++ b/pkgs/development/python-modules/linknlink/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "linknlink"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "xuanxuan000"; + repo = "python-linknlink"; + rev = "refs/tags/${version}"; + hash = "sha256-pr0FwNweg7hFcvaOHQyXjIzH1L6Q4q/1llwfdl9k0Sk="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + cryptography + ]; + + pythonImportsCheck = [ + "linknlink" + ]; + + # Module has no test + doCheck = false; + + meta = with lib; { + description = "Module and CLI for controlling Linklink devices locally"; + homepage = "https://github.com/xuanxuan000/python-linknlink"; + changelog = ""; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index 800fc6227b01..18aeac19b3ca 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.2.0"; + version = "8.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - hash = "sha256-7Udmon/5E741+v2vBHHL7h31r91RR33hN1WhL3FiDQc="; + hash = "sha256-fL3JlZWTEEinYILNeHw0cuvVza27atLLxjrBZkVLRiU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index c97624c73c8a..0720a290cb9c 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.38.0"; + version = "1.39.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LYwjcm4qZfzrDSujQ9eaxjPN9z0qWDSfT+IU1f32cY0="; + hash = "sha256-B3+2KnRXWkB83Sy/NH9kJwgSha9L17tx37fFwBjT3Mw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mitmproxy-macos/default.nix b/pkgs/development/python-modules/mitmproxy-macos/default.nix new file mode 100644 index 000000000000..39798d90b15d --- /dev/null +++ b/pkgs/development/python-modules/mitmproxy-macos/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +}: + +buildPythonPackage rec { + pname = "mitmproxy-macos"; + version = "0.3.11"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mitmproxy"; + repo = "mitmproxy_rs"; + rev = version; + hash = "sha256-V6LUr1jJiTo0+53jipkTyzG5JSw6uHaS6ziyBaFbETw="; + }; + + sourceRoot = "${src.name}/mitmproxy-macos"; + pythonImportsCheck = [ "mitmproxy_macos" ]; + nativeBuildInputs = [ + hatchling + ]; + + meta = with lib; { + description = "The MacOS Rust bits in mitmproxy"; + homepage = "https://github.com/mitmproxy/mitmproxy_rs/tree/main/mitmproxy-macos"; + changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ boltzmannrain ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/development/python-modules/mitmproxy-rs/default.nix b/pkgs/development/python-modules/mitmproxy-rs/default.nix index 15850ab7cd78..d90e1e0c2a96 100644 --- a/pkgs/development/python-modules/mitmproxy-rs/default.nix +++ b/pkgs/development/python-modules/mitmproxy-rs/default.nix @@ -4,6 +4,8 @@ , fetchFromGitHub , rustPlatform , darwin +, libiconv +, mitmproxy-macos }: buildPythonPackage rec { @@ -34,13 +36,15 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security + libiconv + mitmproxy-macos ]; pythonImportsCheck = [ "mitmproxy_rs" ]; meta = with lib; { description = "The Rust bits in mitmproxy"; - homepage = " https://github.com/mitmproxy/mitmproxy_rs"; + homepage = "https://github.com/mitmproxy/mitmproxy_rs"; changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 1c57361a6406..566c1e0b3298 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , buildPythonPackage , pythonOlder +, stdenv # Mitmproxy requirements , aioquic , asgiref @@ -15,6 +16,7 @@ , hyperframe , kaitaistruct , ldap3 +, mitmproxy-macos , mitmproxy-rs , msgpack , passlib @@ -81,6 +83,8 @@ buildPythonPackage rec { urwid wsproto zstandard + ] ++ lib.optionals stdenv.isDarwin [ + mitmproxy-macos ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/mopeka-iot-ble/default.nix b/pkgs/development/python-modules/mopeka-iot-ble/default.nix index 318bd9a00bbd..a5bb698aa1af 100644 --- a/pkgs/development/python-modules/mopeka-iot-ble/default.nix +++ b/pkgs/development/python-modules/mopeka-iot-ble/default.nix @@ -12,8 +12,8 @@ buildPythonPackage rec { pname = "mopeka-iot-ble"; - version = "0.4.1"; - format = "pyproject"; + version = "0.5.0"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -21,9 +21,14 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x/cKg2NC6kssUQeBuQH4yghlRDgs/fJ0bWWL+qnHgcM="; + hash = "sha256-m27As3tB77JbgY0kDDJ6kmYFTv2O/Sh6y9tFiKDIjbI="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=mopeka_iot_ble --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -39,11 +44,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=mopeka_iot_ble --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "mopeka_iot_ble" ]; diff --git a/pkgs/development/python-modules/mpl-scatter-density/default.nix b/pkgs/development/python-modules/mpl-scatter-density/default.nix new file mode 100644 index 000000000000..f0523c3594dc --- /dev/null +++ b/pkgs/development/python-modules/mpl-scatter-density/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, pytestCheckHook +, fetchFromGitHub +, fetchpatch +, pythonOlder +, setuptools-scm +, setuptools +, fast-histogram +, matplotlib +, numpy +, wheel +, pytest-mpl +}: + +buildPythonPackage rec { + pname = "mpl-scatter-density"; + version = "0.7"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "astrofrog"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-MMxM+iv5p9ZLcBpqa3tBBPbsMM/PTg6BXaDpGgSw+DE="; + }; + + patches = [ + # https://github.com/astrofrog/mpl-scatter-density/pull/37 + (fetchpatch { + name = "distutils-removal.patch"; + url = "https://github.com/ifurther/mpl-scatter-density/commit/6feedabe1e82da67d8eec46a80eb370d9f334251.patch"; + sha256 = "sha256-JqWlSm8mIwqjRPa+kMEaKipJyzGEO+gJK+Q045N1MXA="; + }) + ]; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + propagatedBuildInputs = [ matplotlib numpy fast-histogram ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mpl + ]; + + disabledTests = [ + # AssertionError: (240, 240) != (216, 216) + # Erroneous pinning of figure DPI, sensitive to runtime environment + "test_default_dpi" + ]; + + pythonImportsCheck = [ "mpl_scatter_density" ]; + + meta = with lib; { + homepage = "https://github.com/astrofrog/mpl-scatter-density"; + description = "Fast scatter density plots for Matplotlib"; + license = licenses.bsd2; + maintainers = with maintainers; [ ifurther ]; + }; +} diff --git a/pkgs/development/python-modules/oca-port/default.nix b/pkgs/development/python-modules/oca-port/default.nix index 0a603b0b91c8..7b948c4ffdf3 100644 --- a/pkgs/development/python-modules/oca-port/default.nix +++ b/pkgs/development/python-modules/oca-port/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "oca-port"; - version = "0.13"; + version = "0.14"; format = "pyproject"; src = fetchPypi { inherit version; pname = "oca_port"; - hash = "sha256-9ihqjnGdBPasiRD2pZeaiibwzFQKI9t+s/zMzvyLLHQ="; + hash = "sha256-P+uCoC2u5lR4oTtloNFd4N+CjssUa5PbzbnhEulaRoc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix index 68f692e4c37a..7983abd2e985 100644 --- a/pkgs/development/python-modules/openai-whisper/default.nix +++ b/pkgs/development/python-modules/openai-whisper/default.nix @@ -2,22 +2,23 @@ , fetchFromGitHub , buildPythonPackage , substituteAll -, cudaSupport ? false + +# build-system +, setuptools # runtime , ffmpeg-headless # propagates -, numpy -, torch -, torchWithCuda -, tqdm , more-itertools -, transformers , numba +, numpy , openai-triton , scipy , tiktoken +, torch +, tqdm +, transformers # tests , pytestCheckHook @@ -25,14 +26,14 @@ buildPythonPackage rec { pname = "whisper"; - version = "20230918"; - format = "setuptools"; + version = "20231117"; + pyproject = true; src = fetchFromGitHub { owner = "openai"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wBAanFVEIIzTcoX40P9eI26UdEu0SC/xuife/zi2Xho="; + hash = "sha256-MJ1XjB/GuYUiECCuuHS0NWHvvs+ko0oTvLuDI7zLNiY="; }; patches = [ @@ -42,31 +43,21 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ - numpy - tqdm - more-itertools - transformers - numba - scipy - tiktoken - ] ++ lib.optionals (!cudaSupport) [ - torch - ] ++ lib.optionals (cudaSupport) [ - openai-triton - torchWithCuda + nativeBuildInputs = [ + setuptools ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "tiktoken==0.3.3" "tiktoken>=0.3.3" - '' - # openai-triton is only needed for CUDA support. - # triton needs CUDA to be build. - # -> by making it optional, we can build whisper without unfree packages enabled - + lib.optionalString (!cudaSupport) '' - sed -i '/if sys.platform.startswith("linux") and platform.machine() == "x86_64":/{N;d}' setup.py - ''; + propagatedBuildInputs = [ + more-itertools + numba + numpy + openai-triton + scipy + tiktoken + torch + tqdm + transformers + ]; preCheck = '' export HOME=$TMPDIR @@ -85,7 +76,7 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/openai/whisper/blob/v$[version}/CHANGELOG.md"; + changelog = "https://github.com/openai/whisper/blob/v${version}/CHANGELOG.md"; description = "General-purpose speech recognition model"; homepage = "https://github.com/openai/whisper"; license = licenses.mit; diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 85f92e478354..64df3dc82e47 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "oslo-log"; - version = "5.3.0"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.log"; inherit version; - hash = "sha256-zJSqvbUOHiVxxsvEs5lpSgVBV2c1kIqYSgIjqeH72z4="; + hash = "sha256-LrNVtYVw8lgR2nb6gUU7h1x8lEoZoj0sMFtKTf670iM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index a88ce34ab0d9..1fcff9e47803 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "17.0.0"; + version = "18.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-rVYyS2Wc3PC3BvkzUSe88sSXxJCElmP5s7B1NxSFAWY="; + hash = "sha256-1OV/oybxZXF2kjLoSA2KyQaTR91jqEWstpELSlUIg2o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 0802156dcd3a..14e77c816b88 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.34.5"; + version = "0.35.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-Lg8oNFb0nc6T8E0fksv2w/bkHB/7PPXipMDGC0i8Kc0="; + hash = "sha256-eHJQXLiuWmJo/Eo4B8gEo44rwpPA7ASjxKSmdu6Tv9M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pvextractor/default.nix b/pkgs/development/python-modules/pvextractor/default.nix new file mode 100644 index 000000000000..315d0411b8e9 --- /dev/null +++ b/pkgs/development/python-modules/pvextractor/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, astropy +, qtpy +, pyqt6 +, pyqt-builder +, setuptools +, setuptools-scm +, scipy +, matplotlib +, spectral-cube +, pytestCheckHook +, pytest-astropy +}: + +buildPythonPackage rec { + pname = "pvextractor"; + version = "0.3"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "radio-astro-tools"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-HYus2Gk3hzKq+3lJLOJQ+EE6LeO+DrvqLK3NpqrUYeI="; + }; + + buildInputs = [ pyqt-builder ]; + nativeBuildInputs = [ setuptools setuptools-scm ]; + propagatedBuildInputs = [ + astropy + scipy + matplotlib + pyqt6 + qtpy + spectral-cube + ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + # collecting ... qt.qpa.xcb: could not connect to display + # qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found. + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + pytest-astropy + ]; + + pythonImportsCheck = [ "pvextractor" ]; + + meta = with lib; { + homepage = "http://pvextractor.readthedocs.io"; + description = "Position-velocity diagram extractor"; + license = licenses.bsd3; + maintainers = with maintainers; [ ifurther ]; + }; +} diff --git a/pkgs/development/python-modules/pygobject-stubs/default.nix b/pkgs/development/python-modules/pygobject-stubs/default.nix index f2c2668f4043..9dde5d012225 100644 --- a/pkgs/development/python-modules/pygobject-stubs/default.nix +++ b/pkgs/development/python-modules/pygobject-stubs/default.nix @@ -1,25 +1,23 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools -, black -, codespell -, isort -, mypy -, pre-commit , pygobject3 +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pygobject-stubs"; - version = "2.9.0"; - format = "pyproject"; + version = "2.10.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pygobject"; repo = "pygobject-stubs"; rev = "refs/tags/v${version}"; - hash = "sha256-A28vH5S5xxY7VIJORbgQ7jAi/wG4WiffNGryiumHWf0="; + hash = "sha256-fz+qzFWl9JJu9CEVkeiV6XUIPDvwWgrfhTo/nj1EH5c="; }; nativeBuildInputs = [ @@ -32,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "PEP 561 Typing Stubs for PyGObject"; homepage = "https://github.com/pygobject/pygobject-stubs"; - changelog = "https://github.com/pygobject/pygobject-stubs/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/pygobject/pygobject-stubs/blob/${version}/CHANGELOG.md"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ hacker1024 ]; }; diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 8980da8e24bd..176e9fcd1545 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.5.1"; + version = "1.5.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-H2rgPA0GW6neFIHZVZxmAP50HJUPCWDZcJ90QxLGXJ8="; + hash = "sha256-7iiB/a8E8E2TSkGuAWR08ESExDz8DKTMjqp4Xnp3wHU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index 7a740efe5a4e..f395f88bf7dc 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -1,14 +1,16 @@ { lib , buildPythonPackage , fetchFromGitHub +, lxml , requests , six +, pyopenssl , pythonOlder }: buildPythonPackage rec { pname = "pyvmomi"; - version = "8.0.2.0"; + version = "8.0.2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +19,7 @@ buildPythonPackage rec { owner = "vmware"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IoYxk/lS7dhw0q3kfpq7y/oDNmc1dOra0YA3CiHe8YM="; + hash = "sha256-Y7Zor70P4lhkAslckg/prfCmnszVMFPntWdJpfWnvIM="; }; propagatedBuildInputs = [ @@ -25,6 +27,13 @@ buildPythonPackage rec { six ]; + passthru.optional-dependencies = { + sso = [ + lxml + pyopenssl + ]; + }; + # Requires old version of vcrpy doCheck = false; diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix index f56921a691aa..674c508696bf 100644 --- a/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-6kfD87GlEb+f6hUSqhyPIy4Xg63f8zDdGKMaOxQYWoM="; + hash = "sha256-A7FQeeYym0nAQlkbpejpZqd5ZgX2cw3/DbshDxlrivw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/siobrultech-protocols/default.nix b/pkgs/development/python-modules/siobrultech-protocols/default.nix index c0439dcec706..e21580162cfe 100644 --- a/pkgs/development/python-modules/siobrultech-protocols/default.nix +++ b/pkgs/development/python-modules/siobrultech-protocols/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "siobrultech-protocols"; - version = "0.12.0"; + version = "0.13.0"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sdwilsh"; repo = "siobrultech-protocols"; rev = "refs/tags/v${version}"; - hash = "sha256-71iFZS5CLYXNw57psLXswNJKfvbeKOqSncLoSsNXqjc="; + hash = "sha256-6BGhelyv0FoPyGwzgIX5Gbbu9Ks19MtL1AZQRZWKzhM="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 88c2ccf45963..3f91435b3aa7 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -1,23 +1,28 @@ { lib , buildPythonPackage , fetchPypi -, requests , pythonOlder +, requests +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "stripe"; - version = "7.4.0"; - format = "setuptools"; + version = "7.5.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Pcfdgjk20yYt1DCr5XQ4rzLokQNS27NOspa/21nvCuw="; + hash = "sha256-duDfcHHaXvORNNkpuMf6zxMZqkfCIr8ScrSKxVq/PW8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests typing-extensions diff --git a/pkgs/development/python-modules/succulent/default.nix b/pkgs/development/python-modules/succulent/default.nix index 3b191bae9b85..e1ad7981b047 100644 --- a/pkgs/development/python-modules/succulent/default.nix +++ b/pkgs/development/python-modules/succulent/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "succulent"; - version = "0.2.5"; + version = "0.2.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "firefly-cpp"; repo = "succulent"; - rev = version; - hash = "sha256-fSsb2UQM69AAjJd/Rvzuok7jBeAa6udbB8FbuNP8Ztw="; + rev = "refs/tags/${version}"; + hash = "sha256-CGDgt6tv+KysrytJsgDKwf2yv6shXizvD67XsGBg+nI="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix index 8759f3562596..84bc944317e1 100644 --- a/pkgs/development/python-modules/syrupy/default.nix +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "syrupy"; - version = "4.5.0"; + version = "4.6.0"; format = "pyproject"; disabled = lib.versionOlder python.version "3.8.1"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tophat"; repo = "syrupy"; rev = "refs/tags/v${version}"; - hash = "sha256-HRCURqnFzo1l+PjX1LtXTSVZGA36OaRgmy4xKizeuOg="; + hash = "sha256-FjDGwSOKvDWx+LwUCNGEOBKV3rFG+09gtFpLLi0xgD4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/testrail-api/default.nix b/pkgs/development/python-modules/testrail-api/default.nix index 6da3e202672a..b6bb8a1b2256 100644 --- a/pkgs/development/python-modules/testrail-api/default.nix +++ b/pkgs/development/python-modules/testrail-api/default.nix @@ -1,29 +1,44 @@ { lib , buildPythonPackage , fetchFromGitHub -, requests , pytestCheckHook +, pythonOlder +, requests , responses +, setuptools-scm }: buildPythonPackage rec { pname = "testrail-api"; - version = "1.12.0"; + version = "1.12.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tolstislon"; repo = "testrail-api"; - rev = version; - sha256 = "sha256-VuAW5Dl3pkA6mtn/mbzxTFoavO5jPoqFSFVlrxc7KRk="; + rev = "refs/tags/${version}"; + hash = "sha256-lIlTrAdNtBJdwiSFwpcHA2e+fRC+MbHS0PX7prAN+RY="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + requests + ]; + nativeCheckInputs = [ pytestCheckHook responses ]; - propagatedBuildInputs = [ - requests + pythonImportsCheck = [ + "testrail_api" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index 5ce5deace5d0..fb510b7e764c 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2023.7"; + version = "2023.11"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = "refs/tags/${version}"; - hash = "sha256-sx4KfWQCvGS+w83tECJSyLLWU9GkwYpo39gt4EKndPk="; + hash = "sha256-UTMYuSKNn5ACKg9BmeUf1SFhDV1jknbxggkmCgzB/xk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index 801b108e5042..97ceedec0d26 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -8,15 +8,16 @@ buildPythonPackage rec { pname = "wakeonlan"; - version = "3.0.0"; - disabled = pythonOlder "3.6"; - format = "pyproject"; + version = "3.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "remcohaszing"; repo = "pywakeonlan"; rev = "refs/tags/${version}"; - hash = "sha256-7BDE7TmTT8rSaG0rEn5QwH+izGWA2PeQzxpGiv7+3fo="; + hash = "sha256-VPdklyD3GVn0cex4I6zV61I0bUr4KQp8DdMKAM/r4io="; }; nativeBuildInputs = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for wake on lan"; homepage = "https://github.com/remcohaszing/pywakeonlan"; + changelog = "https://github.com/remcohaszing/pywakeonlan/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/xlsxwriter/default.nix b/pkgs/development/python-modules/xlsxwriter/default.nix index f19fe38366cd..5bd96b3aa1b6 100644 --- a/pkgs/development/python-modules/xlsxwriter/default.nix +++ b/pkgs/development/python-modules/xlsxwriter/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "xlsxwriter"; - version = "3.1.7"; + version = "3.1.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "jmcnamara"; repo = "XlsxWriter"; rev = "RELEASE_${version}"; - hash = "sha256-ZOKS9sTZvlopfIYOEhOk/rq4qtcMrNQ4Bwb8lDtKfxs="; + hash = "sha256-FkSInLinyn/eXBMSuivzFxCTZijOKdSG4l+gHyKENuY="; }; nativeCheckInputs = [ @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for creating Excel XLSX files"; homepage = "https://xlsxwriter.readthedocs.io/"; + changelog = "https://xlsxwriter.readthedocs.io/changes.html"; license = licenses.bsd2; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 2531a6648e36..40af2c4fb629 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.3.1"; + version = "1.3.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sigma67"; repo = "ytmusicapi"; rev = "refs/tags/${version}"; - hash = "sha256-6dsMOFyZ8cX2zKXX682b5znJvXYTeKt99Wafz7RkfQw="; + hash = "sha256-vDkrKVqyisPkswvfb+UPH95mehwNgyFxRmeT+1UHvXs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/api-linter/default.nix b/pkgs/development/tools/api-linter/default.nix index b34e2ed4f80f..5b0e8e7c5928 100644 --- a/pkgs/development/tools/api-linter/default.nix +++ b/pkgs/development/tools/api-linter/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "api-linter"; - version = "1.59.0"; + version = "1.59.1"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-rT7mN/vW7o7Qj2BUYmwePJtvURYdgvRK7Oi7Rw/RK4A="; + hash = "sha256-PgDdCcXiy9Dpop2myuRoi8KQROZdJ76ce4ax7wU4bpc="; }; - vendorHash = "sha256-TV0lA0DkQu3e9aq2uX4Ea8vrvDXxM8vgOn7EXGjld9E="; + vendorHash = "sha256-egAZ4CeSSStfkN2mGgzGHTBojHKHoVEf3o0oi+OpMkw="; subPackages = [ "cmd/api-linter" ]; @@ -23,7 +23,7 @@ buildGoModule rec { "-w" ]; - # reference: https://github.com/googleapis/api-linter/blob/v1.59.0/.github/workflows/release.yaml#L76 + # reference: https://github.com/googleapis/api-linter/blob/v1.59.1/.github/workflows/release.yaml#L76 preBuild = '' cat > cmd/api-linter/version.go < $dir/cupswrapper/brmfc465.ppd + sed -n '/ENDOFPPDFILE_END/,/ENDOFPPDFILE_END/p' "$dir/cupswrapper/cupswrappermfc465cn" | head -n -1 | tail -n +2 >> $dir/cupswrapper/brmfc465.ppd + chmod 644 $dir/cupswrapper/brmfc465.ppd + mkdir -p $out/lib/cups/filter + mkdir -p $out/share/cups/model + ln $dir/cupswrapper/cupswrappermfc465cn $out/lib/cups/filter + ln $dir/cupswrapper/brmfc465.ppd $out/share/cups/model + sed -n '/!ENDOFWFILTER!/,/!ENDOFWFILTER!/p' "$dir/cupswrapper/cupswrappermfc465cn" | sed '1 br; b; :r s/.*/printer_model=mfc465cn; cat < $out/lib/cups/filter/brlpdwrappermfc465cn + sed -i "/#! \/bin\/sh/a PATH=${lib.makeBinPath [ coreutils gnused gnugrep ]}:\$PATH" $out/lib/cups/filter/brlpdwrappermfc465cn + chmod 755 $out/lib/cups/filter/brlpdwrappermfc465cn + ''; + + meta = with lib; { + description = "Brother MFC-465CN CUPS wrapper driver"; + homepage = "http://www.brother.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ phrogg ]; + }; +} diff --git a/pkgs/misc/cups/drivers/brother/mfc465cnlpr/default.nix b/pkgs/misc/cups/drivers/brother/mfc465cnlpr/default.nix new file mode 100644 index 000000000000..dc0be00a6932 --- /dev/null +++ b/pkgs/misc/cups/drivers/brother/mfc465cnlpr/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, lib +, fetchurl +, dpkg +, makeWrapper +, coreutils +, file +, gawk +, ghostscript +, gnused +, pkgsi686Linux +}: + +stdenv.mkDerivation rec { + pname = "mfc465cnlpr"; + version = "1.0.1-1"; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf006132/${pname}-${version}.i386.deb"; + sha256 = "cfe0289510bf36bee6014286ea78b1ebc6bbb948dbfd3aee02f0664a7743f99b"; + }; + + unpackPhase = '' + dpkg-deb -x $src $out + ''; + + nativeBuildInputs = [ + dpkg + makeWrapper + ]; + + dontBuild = true; + + installPhase = '' + dir=$out/usr/local/Brother/Printer/mfc465cn + patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $dir/lpd/brmfc465cnfilter + wrapProgram $dir/inf/setupPrintcapij \ + --prefix PATH : ${lib.makeBinPath [ + coreutils + ]} + substituteInPlace $dir/lpd/filtermfc465cn \ + --replace "BR_PRT_PATH=" "BR_PRT_PATH=\"$dir/\" #" + wrapProgram $dir/lpd/filtermfc465cn \ + --prefix PATH : ${lib.makeBinPath [ + coreutils + file + ghostscript + gnused + ]} + substituteInPlace $dir/lpd/psconvertij2 \ + --replace '`which gs`' "${ghostscript}/bin/gs" + wrapProgram $dir/lpd/psconvertij2 \ + --prefix PATH : ${lib.makeBinPath [ + gnused + gawk + ]} + chmod -R a+w $dir/inf/ + ''; + + meta = with lib; { + description = "Brother MFC-465CN LPR printer driver"; + homepage = "http://www.brother.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ phrogg ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index 72ef086f5990..6a3bddc211e9 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -32,6 +32,7 @@ appleDerivation { ]; meta = { + mainProgram = "iconv"; platforms = lib.platforms.darwin; }; } diff --git a/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/os-specific/darwin/sketchybar/default.nix index ab1c0b58185f..9b3ef924dd07 100644 --- a/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/pkgs/os-specific/darwin/sketchybar/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sketchybar"; - version = "2.19.3"; + version = "2.19.4"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "SketchyBar"; rev = "v${finalAttrs.version}"; - hash = "sha256-QT926AnV9jLc1KvYks6ukIAcMbVHOupTJWQ6vBHpcxc="; + hash = "sha256-6MqTyCqFv5suQgQ5a9t1mDA2njjFFgk67Kp7xO5OXoA="; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/checksec/0002-don-t-sanatize-the-environment.patch b/pkgs/os-specific/linux/checksec/0002-don-t-sanatize-the-environment.patch new file mode 100644 index 000000000000..bd639574f63f --- /dev/null +++ b/pkgs/os-specific/linux/checksec/0002-don-t-sanatize-the-environment.patch @@ -0,0 +1,25 @@ +From 3b047ab4271919856ae0a3dee3a03a24045c0016 Mon Sep 17 00:00:00 2001 +From: Paul Meyer <49727155+katexochen@users.noreply.github.com> +Date: Mon, 13 Nov 2023 20:24:54 +0000 +Subject: [PATCH] don't sanatize the environment + +--- + checksec | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/checksec b/checksec +index 4fc3c31..135223a 100755 +--- a/checksec ++++ b/checksec +@@ -2,9 +2,6 @@ + # Do not edit this file directly, this file is generated from the files + # in the src directory. Any updates to this file will be overwritten when generated + +-# sanitize the environment before run +-[[ "$(env | /bin/sed -r -e '/^(PWD|SHLVL|_)=/d')" ]] && exec -c "$0" "$@" +- + # --- Modified Version --- + # Name : checksec.sh + # Version : 1.7.0 +-- +2.42.0 diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index 1bdd4cf5f677..07574722cd20 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -1,14 +1,30 @@ { lib , stdenv +, fetchpatch , fetchFromGitHub , makeWrapper +, testers +, runCommand + + # dependencies +, binutils +, coreutils +, curl +, elfutils , file , findutils -, binutils-unwrapped +, gawk , glibc -, coreutils -, sysctl +, gnugrep +, gnused , openssl +, procps +, sysctl +, wget +, which + + # tests +, checksec }: stdenv.mkDerivation rec { @@ -24,6 +40,13 @@ stdenv.mkDerivation rec { patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch + # Tool would sanitize the environment, removing the PATH set by our wrapper. + ./0002-don-t-sanatize-the-environment.patch + # Fix the exit code of debug_report command. Check if PR 226 was merged when upgrading version. + (fetchpatch { + url = "https://github.com/slimm609/checksec.sh/commit/851ebff6972f122fde5507f1883e268bbff1f23d.patch"; + hash = "sha256-DOcVF+oPGIR9VSbqE+EqWlcNANEvou1gV8qBvJLGLBE="; + }) ]; nativeBuildInputs = [ @@ -33,22 +56,45 @@ stdenv.mkDerivation rec { installPhase = let path = lib.makeBinPath [ - findutils + binutils + coreutils + curl + elfutils file - binutils-unwrapped - sysctl + findutils + gawk + gnugrep + gnused openssl + procps + sysctl + wget + which ]; in '' mkdir -p $out/bin install checksec $out/bin - substituteInPlace $out/bin/checksec --replace /lib/libc.so.6 ${glibc.out}/lib/libc.so.6 - substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -" + substituteInPlace $out/bin/checksec \ + --replace "/bin/sed" "${gnused}/bin/sed" \ + --replace "/usr/bin/id" "${coreutils}/bin/id" \ + --replace "/lib/libc.so.6" "${glibc}/lib/libc.so.6" wrapProgram $out/bin/checksec \ --prefix PATH : ${path} ''; + passthru.tests = { + version = testers.testVersion { + package = checksec; + version = "v${version}"; + }; + debug-report = runCommand "debug-report" { buildInputs = [ checksec ]; } '' + checksec --debug_report || exit 1 + echo "OK" + touch $out + ''; + }; + meta = with lib; { description = "Tool for checking security bits on executables"; homepage = "https://www.trapkit.de/tools/checksec/"; diff --git a/pkgs/os-specific/linux/uhk-agent/default.nix b/pkgs/os-specific/linux/uhk-agent/default.nix index fe01cecc8cc7..5ee485b09cf8 100644 --- a/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/pkgs/os-specific/linux/uhk-agent/default.nix @@ -11,12 +11,12 @@ let pname = "uhk-agent"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-YMm84jKtWz5DeGJhBlmo2hlIy4iarEvWylgAWY/itII="; + sha256 = "sha256-qAZ92/iN5E+1KGPs6u9Bb6vLfi0Keog/yOcLtnRD7yc="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/servers/mail/mailpit/default.nix b/pkgs/servers/mail/mailpit/default.nix index baf15dce13e9..cfc71d0c24a4 100644 --- a/pkgs/servers/mail/mailpit/default.nix +++ b/pkgs/servers/mail/mailpit/default.nix @@ -34,6 +34,12 @@ let hash = "sha256-r4yv2qImIlNMPJagz5i1sxqBDnFAucc2kDUmjGktM6A="; }; + env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + # Make sure libc++ uses `posix_memalign` instead of `aligned_alloc` on x86_64-darwin. + # Otherwise, nodejs would require the 11.0 SDK and macOS 10.15+. + NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300"; + }; + nativeBuildInputs = [ nodejs python3 libtool npmHooks.npmConfigHook ]; buildPhase = '' diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 8d201624a642..566f7d1cabfa 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-lBseLxxk+3/eoJMdq4muOrA0TgEhwIReGtQO1OzqBFc="; + hash = "sha256-uouxOXvVbUNRHM83JearPhMTZQtMPEBfWvsVb7QJSO8="; }; buildInputs = [ olm ]; - vendorHash = "sha256-QUZ9x9BDlhoWLvdt8BTIKxHcsclT6arGICeJnOafs1g="; + vendorHash = "sha256-dgaI/gpngCcVRVK8SK6ac1hmc7/aYLJCnW2CCYRDXy0="; doCheck = false; diff --git a/pkgs/servers/microbin/default.nix b/pkgs/servers/microbin/default.nix index 3d75a7ff8c7c..163b4ba7d800 100644 --- a/pkgs/servers/microbin/default.nix +++ b/pkgs/servers/microbin/default.nix @@ -1,11 +1,12 @@ -{ lib -, rustPlatform +{ darwin , fetchFromGitHub -, pkg-config +, fetchpatch +, lib , oniguruma , openssl +, pkg-config +, rustPlatform , stdenv -, darwin }: rustPlatform.buildRustPackage rec { @@ -21,6 +22,44 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-7GSgyh2aJ2f8pozoh/0Yxzbk8Wg3JYuqSy/34ywAc2s="; + patches = [ + # Prefix some URLs with args.public_path_as_str() by PeterUpfold + # https://github.com/szabodanika/microbin/pull/194 + # MicroBin returns wrong URLs on deployments with non-root URLs. + (fetchpatch { + name = "0001-fixup-explicit-urls.patch"; + url = "https://github.com/szabodanika/microbin/compare/b8a0c5490d681550d982ad02d67a1aaa0897f503..df062134cbaf3fd0ebcb67af8453a4c66844cd13.patch"; + hash = "sha256-h13FBuzu2O4AwdhRHF5EX5LaKyPeWJAcaV6SGTaYzTg="; + }) + + # Minor fixups by LuK1337 + # https://github.com/szabodanika/microbin/pull/211 + # Fixup styling, password protected and private pastas. + (fetchpatch { + name = "0002-minor-fixups.patch"; + url = "https://github.com/szabodanika/microbin/compare/b8a0c5490d681550d982ad02d67a1aaa0897f503..3b0c025e9b6dc1ca69269541940bdb53032a048a.patch"; + hash = "sha256-cZB/jx5d6F+C4xOn49TQ1at/Z4ov26efo9PTtWEdCHw="; + }) + + # Fix MICROBIN_ETERNAL_PASTA by SouthFox-D + # https://github.com/szabodanika/microbin/pull/215 + # MICROBIN_ETERNAL_PASTA config doesn't work without this. + (fetchpatch { + name = "0003-fix-microbin-eternal-pasta.patch"; + url = "https://github.com/szabodanika/microbin/compare/b8a0c5490d681550d982ad02d67a1aaa0897f503..c7c846c64344b8d51500aa9a4b2e9a92de8d09d8.patch"; + hash = "sha256-gCio73Jt0F7YCFtQxtf6pPBDLNcyOAcfSsiyjLFzEzY="; + }) + + # Fix raw pastes returning 404 by GizmoTjaz + # https://github.com/szabodanika/microbin/pull/218 + # Existing pastas return code 404 even when they exist. + (fetchpatch { + name = "0004-fix-raw-pastas-returning-404.patch"; + url = "https://github.com/szabodanika/microbin/compare/b8a0c5490d681550d982ad02d67a1aaa0897f503..e789901520824d4bf610d28923097affe85ead7d.patch"; + hash = "sha256-R47ozwu/FD1kCu5nx4Gf1cOFeLVFdS67K8RNDygwoZM="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/servers/monitoring/uptime-kuma/default.nix index 917343ffecd1..572b83ba9cef 100644 --- a/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "uptime-kuma"; - version = "1.23.3"; + version = "1.23.6"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; rev = version; - hash = "sha256-YffkCFws/61uX6BwYqTeuAq5vqLOC+FeUt6rtQG6xws="; + hash = "sha256-E/iyusAZnEnfXQ63LZA+9dgE0MvhFOKmrIXCEZ+LGi8="; }; - npmDepsHash = "sha256-USyLvC6ior1YhiZz6YySaG7xiYziHB01SHC9BPwuvJo="; + npmDepsHash = "sha256-AeN6+0DKd+Q2g3I960PeL3IBla5S7X0od9J244HiwLU="; patches = [ # Fixes the permissions of the database being not set correctly diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 7500c0ca4ff2..73c826e968ad 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.21.4"; + version = "1.24.0"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-pa9xsbO/d5/3wCx2XKn4dzlqPlO3Ie/cGJiwfWTEUKc="; + sha256 = "sha256-bft4fa/ZABodrm7uwl7o2whqWhxuL7l3nLqCuTv4V0k="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-1Cy0PmDmMPpPZ2PLDP6sywb39MuExv2yabqSeP3Of9M="; + vendorHash = "sha256-0UNIPwFiQisWDRFaCA3JuS9R0byhWcCDQb54DZXQJ2w="; proxyVendor = true; doCheck = false; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index e705d8bc394c..c961321a875f 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -66,8 +66,7 @@ in rec { }; unifi7 = generic { - version = "7.5.176"; - suffix = "-1136930355"; - sha256 = "sha256-prsFq09zYrB74p/MGKjwvZftw78k9wbIva5xFdk+Ztw="; + version = "7.5.187"; + sha256 = "sha256-a5kl8gZbRnhS/p1imPl7soM0/QSFHdM0+2bNmDfc1mY="; }; } diff --git a/pkgs/shells/fish/plugins/done.nix b/pkgs/shells/fish/plugins/done.nix index ad16e257bf62..1c1f5848aa30 100644 --- a/pkgs/shells/fish/plugins/done.nix +++ b/pkgs/shells/fish/plugins/done.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "done"; - version = "1.17.1"; + version = "1.19.1"; src = fetchFromGitHub { owner = "franciscolourenco"; repo = "done"; rev = version; - hash = "sha256-aYKTkx5v7tB6k/UBcS0NOgA6SiRrjzn1lUTH/Xp5DFM="; + hash = "sha256-BGHfwKoMfOZUsa05kEt8W2luc1aC3Su/OyaGmcb4UiI="; }; checkPlugins = [ fishtape ]; @@ -16,10 +16,10 @@ buildFishPlugin rec { fishtape test/done.fish ''; - meta = { + meta = with lib; { description = "Automatically receive notifications when long processes finish"; homepage = "https://github.com/franciscolourenco/done"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ malo ]; + license = licenses.mit; + maintainers = [ maintainers.malo ]; }; } diff --git a/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix b/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix index 83192ad092f5..14b57b9a62c6 100644 --- a/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix +++ b/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "github-copilot-cli.fish"; - version = "0.1.33"; + version = "0.1.33.1"; src = fetchFromGitHub { owner = "z11i"; repo = pname; rev = version; - hash = "sha256-dhACPlFrw1Z0dW0eA0IMnOelYJc7Fyz2D9u+rL1pyiM="; + hash = "sha256-CFXbeO0euC/UtvQV0KCz4WQfdJgsuXKPM6M9oaw7hvg="; }; meta = with lib; { diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 7c7ba87d848d..1565fb8b16f0 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-prezto"; - version = "unstable-2023-09-12"; + version = "unstable-2023-11-08"; src = fetchFromGitHub { owner = "sorin-ionescu"; repo = "prezto"; - rev = "5ac930d96be3a51730f7d9d7330f28d9c9c36e0a"; - sha256 = "tyroeGADhBRCQ9/WqNSqMV7kvFUPdC2fcs/B5G5qYhI="; + rev = "f04191aa8ae475cf71f491830d424226d84501c9"; + sha256 = "7cdtDKNyTSUn3Fo6BO3f0SMBgOQs4/5SnHXB7JtAdkA="; fetchSubmodules = true; }; diff --git a/pkgs/tools/X11/srandrd/default.nix b/pkgs/tools/X11/srandrd/default.nix index 4c79e11765cb..84f43301bbd7 100644 --- a/pkgs/tools/X11/srandrd/default.nix +++ b/pkgs/tools/X11/srandrd/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "srandrd"; - version = "0.6.0"; + version = "0.6.3"; src = fetchFromGitHub { owner = "jceb"; repo = pname; rev = "v${version}"; - sha256 = "07r1ck2ijj30n19ylndgw75ly9k3815kj9inpxblfnjpwbbw6ic0"; + sha256 = "sha256-Wf+tVqDaNAiH6UHN8fFv2wM+LEch6wKlZOkqWEqLLkw="; }; buildInputs = [ libX11 libXrandr libXinerama ]; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 862b68be94ef..e7d889e9009c 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "exoscale-cli"; - version = "1.74.3"; + version = "1.74.4"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-upnwaY++tUg4LcuD/BMSvvM2bo/95OP+SUK/aOiq1Oo="; + sha256 = "sha256-PzjIcdzEmX+0PRurOX5ZQ4LQnBny9Av8eKhPsyiZb6c="; }; vendorHash = null; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 918f0bd841d7..f6e1cb2e0b11 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -81,7 +81,13 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests = { smoke-test = nixosTests.bcachefs; - inherit (nixosTests.installer) bcachefsSimple bcachefsEncrypted bcachefsMulti; + + inherit (nixosTests.installer) + bcachefsSimple + bcachefsEncrypted + bcachefsMulti + bcachefsLinuxTesting + bcachefsUpgradeToLinuxTesting; }; updateScript = writeScript "update-bcachefs-tools-and-cargo-lock.sh" '' diff --git a/pkgs/tools/graphics/lsix/default.nix b/pkgs/tools/graphics/lsix/default.nix index a9f8aa21bf1d..dcf078654b82 100644 --- a/pkgs/tools/graphics/lsix/default.nix +++ b/pkgs/tools/graphics/lsix/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "lsix"; - version = "1.8"; + version = "1.8.2"; src = fetchFromGitHub { owner = "hackerb9"; repo = pname; rev = version; - sha256 = "sha256-Qx6/PFm1XBmEI6iI+Ref9jNe6sXIhsVL4VQ1CX+caZE="; + sha256 = "sha256-xlOlAfZonSo/RERt5WxPqMvppVrY5/Yhh7SgCCsYDQE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40889.patch b/pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40889.patch new file mode 100644 index 000000000000..7b7ca5a0befa --- /dev/null +++ b/pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40889.patch @@ -0,0 +1,17 @@ +Simple bounds checks for CVE-2023-40889, based on third-party +fix by Remi Meier @ +https://github.com/Raemi/zbar/commit/5e8acc6974f17e56c3ddaa5509870beb8d7a599c + +--- a/zbar/qrcode/qrdec.c ++++ b/zbar/qrcode/qrdec.c +@@ -3900,8 +3900,8 @@ void qr_reader_match_centers(qr_reader *_reader,qr_code_data_list *_qrlist, + /*TODO: We might be able to accelerate this step significantly by + considering the remaining finder centers in a more intelligent order, + based on the first finder center we just chose.*/ +- for(j=i+1;!mark[i]&&j<_ncenters;j++){ +- for(k=j+1;!mark[j]&&k<_ncenters;k++)if(!mark[k]){ ++ for(j=i+1; i < _ncenters && !mark[i]&&j<_ncenters;j++){ ++ for(k=j+1; j < _ncenters && !mark[j]&&k<_ncenters;k++)if(!mark[k]){ + qr_finder_center *c[3]; + qr_code_data qrdata; + int version; diff --git a/pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40890.patch b/pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40890.patch new file mode 100644 index 000000000000..3576df214ae1 --- /dev/null +++ b/pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40890.patch @@ -0,0 +1,26 @@ +Simple bounds checks for CVE-2023-40890 + +--- a/zbar/decoder/databar.c ++++ b/zbar/decoder/databar.c +@@ -23,6 +23,8 @@ + + #include + #include ++#include ++#include + + #ifdef DEBUG_DATABAR + # define DEBUG_LEVEL (DEBUG_DATABAR) +@@ -691,6 +693,12 @@ lookup_sequence (databar_segment_t *seg, + fixed = -1; + s <<= 1; + dbprintf(2, "%x", s); ++ ++ if (i > 20) { ++ fprintf(stderr, "Bug: Out-of-bounds condition detected\n"); ++ exit(99); ++ } ++ + seq[i++] = s++; + seq[i++] = s; + } diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index f9b84d2656a3..5a1d7e94fdf6 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , imagemagickBig , pkg-config , withXorg ? true @@ -42,6 +43,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-VhVrngAX7pXZp+szqv95R6RGAJojp3svdbaRKigGb0w="; }; + patches = [ + ./0.23.92-CVE-2023-40889.patch + ./0.23.92-CVE-2023-40890.patch + ]; + nativeBuildInputs = [ pkg-config xmlto diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index b46b94037083..efee9f7043e5 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "entr"; - version = "5.4"; + version = "5.5"; src = fetchurl { url = "https://eradman.com/entrproject/code/${pname}-${version}.tar.gz"; - hash = "sha256-SR3e0sw/Hc2NJvSWpMezqZa5HHqyCIPKN1A3o5giH54="; + hash = "sha256-EowM4u/qWua9P9M8PNMeFh6wwCYJ2HF6036VtBZW5SY="; }; postPatch = '' diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index fe1d957437d0..074088f3f19e 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iF1E9wBX9UVv/zuCgznXqKLBF+Xk0LqVdJfxFNpmzRI="; + sha256 = "sha256-An1biuaqPeRniJZroxoT2o9IEA4XFf5l6ut4nmOsQJI="; }; - cargoHash = "sha256-xf4Q6nk2sYuAV+B7dsRF+feiLRKLXDSHnlYmw+o5bNc="; + cargoHash = "sha256-gnFu0JsMt1wMfifF6EnjDwwydFnVyqpkHV0cyR5Qt3Y="; nativeBuildInputs = [ pandoc installShellFiles copyDesktopItems ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index c27e1ff1aacc..8e783fc15509 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -25,13 +25,13 @@ let in buildGoModule rec { pname = "fzf"; - version = "0.44.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - hash = "sha256-YIMtLQzxORWFWCgdnLUQLmmE79aw40LhcxqiHCWjgNk="; + hash = "sha256-oL3AA/3RPKcXLBNYaBYleueQph7/xvN/UEhwcYM9lAs="; }; vendorHash = "sha256-EutNjyW5bvGvMZP9xBrcu91TOAbl9TDZe2+g0/qnuAQ="; diff --git a/pkgs/tools/misc/gh-actions-cache/default.nix b/pkgs/tools/misc/gh-actions-cache/default.nix index 8bc735f4e523..46fe8cb704d1 100644 --- a/pkgs/tools/misc/gh-actions-cache/default.nix +++ b/pkgs/tools/misc/gh-actions-cache/default.nix @@ -21,8 +21,9 @@ buildGoModule rec { "-w" ]; - # Tests need network - doCheck = false; + # Needed for tests. + # https://github.com/actions/gh-actions-cache/issues/53#issuecomment-1464954495 + env.GH_TOKEN = "dummy-token-to-facilitate-rest-client"; meta = { description = "gh extension to manage GitHub Actions caches"; diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index ec0f90a5c46d..2d48edf2dfd2 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=implicit-function-declaration"; + meta = with lib; { description = "Readline wrapper for console programs"; homepage = "https://github.com/hanslub42/rlwrap"; diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index f6b372d92649..0f93551965e2 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -114,7 +114,5 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ ]; platforms = platforms.unix; - # "Couldn't find any versions for \"node-gyp\" that matches \"latest\" in our cache (possible versions are \"\") - broken = true; }; } diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 52b561e57904..a0acfcf7f7d6 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.9w.1"; + version = "0.9.16"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-/EQ8+8ac1MnWuXL9aNYl5U2ZfTpd/iThyvXygorbPmM="; + sha256 = "sha256-nX7T3TAGgxAB65X8D2HlI+3T6p7aH3bwG3N1pScX/4g="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/tools/misc/wasm-tools/default.nix index 6d772a8ba5c3..2249ea83d1ab 100644 --- a/pkgs/tools/misc/wasm-tools/default.nix +++ b/pkgs/tools/misc/wasm-tools/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.0.51"; + version = "1.0.52"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-SeUwd9S2WMGbNqj9NzZZKW1tQWc0cbe+uZmHc1PWKR8="; + hash = "sha256-6x2H+WY23XxBWmAqD2Lsc4TdCY76XiR/BhSU++XuIFY="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-G7pIy8KuDEEVVhH0WzY93eDhH2oTT9sP5CqTgfxYB0c="; + cargoHash = "sha256-1YnoHL+FKXhopcW0Scya22sRBwantRH9gF7w/rxU0H8="; cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoTestFlags = [ "--all" ]; diff --git a/pkgs/tools/networking/hp2p/default.nix b/pkgs/tools/networking/hp2p/default.nix index 52f3455ed4d5..9e2b5d639049 100644 --- a/pkgs/tools/networking/hp2p/default.nix +++ b/pkgs/tools/networking/hp2p/default.nix @@ -2,20 +2,19 @@ stdenv.mkDerivation rec { pname = "hp2p"; - version = "3.3"; + version = "unstable-2023-10-25"; src = fetchFromGitHub { owner = "cea-hpc"; repo = "hp2p"; - rev = version; - sha256 = "0zvlwb941rlp3vrf9yzv7njgpj3mh4671ch7qvxfa4hq2ivd52br"; + rev = "711f6cc5b4e552d969c2436ad77afd35d31bfd05"; + sha256 = "sha256-mBTJZb3DPmIlL7N+PfjlWmBw0WfFF2DesImVZlbDQKc="; }; - patches = [ ./python3.patch ]; enableParallelBuilding = true; nativeBuildInputs = [ autoconf automake python3Packages.wrapPython ]; - buildInputs = [ mpi ] ++ (with python3Packages; [ python numpy matplotlib plotly mpldatacursor ]) ; - pythonPath = (with python3Packages; [ numpy matplotlib plotly mpldatacursor ]) ; + buildInputs = [ mpi ] ++ (with python3Packages; [ python plotly ]) ; + pythonPath = (with python3Packages; [ plotly ]) ; preConfigure = '' patchShebangs autogen.sh diff --git a/pkgs/tools/networking/hp2p/python3.patch b/pkgs/tools/networking/hp2p/python3.patch deleted file mode 100644 index 13043d9f09f1..000000000000 --- a/pkgs/tools/networking/hp2p/python3.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -u -r source.orig/src/vizhp2p source/src/vizhp2p ---- source.orig/src/vizhp2p 1970-01-01 01:00:01.000000000 +0100 -+++ source/src/vizhp2p 2021-08-24 10:41:42.926881770 +0200 -@@ -94,25 +94,25 @@ - with open(hostfile) as fd: - for line in fd: - if line.startswith(motif_rank): -- print line -+ print(line) - c,v = line[len(motif_rank)+1:-1].split(separator) - nodes[c] = v - - # display k worst nodes indices -- print "\nTop %d bad mean:" % k -+ print("\nTop %d bad mean:" % k) - mean_order = np.argsort(a_mean) -- print [nodes[str(c)] for c in mean_order[:k]] -+ print([nodes[str(c)] for c in mean_order[:k]]) - mean_st = "Top nodes with bad mean:\n" - for i in range(0, k, hostname_per_line): - mean_st += repr([nodes[str(c)] for c - in mean_order[i:i + hostname_per_line]]) + "\n" - -- print "Top %d bad std:" % k -- print [nodes[str(c)] for c in np.argsort(a_std)[-k:][::-1]] -+ print("Top %d bad std:" % k) -+ print([nodes[str(c)] for c in np.argsort(a_std)[-k:][::-1]]) - -- print "Top %d bad mean/std:" % k -+ print("Top %d bad mean/std:" % k) - pen_order = np.argsort(a_mean / a_std) -- print [nodes[str(c)] for c in pen_order[:k]] -+ print([nodes[str(c)] for c in pen_order[:k]]) - pen_st = "Top nodes with bad mean/std:\n" - for i in range(0, k, hostname_per_line): - pen_st += repr([nodes[str(c)] for c -@@ -293,9 +293,9 @@ - # and 'p' (snapshot) - def onrefresh(event): - if event.key == 'r': -- print "refreshing...", -+ print("refreshing...", end=' ') - loop() -- print "ok" -+ print("ok") - elif event.key == 'q': - exit() - elif event.key == 'p': -@@ -303,9 +303,9 @@ - fig1.savefig(snapfile) - snapfile = outputname + "_snapshot_time.png" - fig2.savefig(snapfile) -- print 'snapshot saved (%s)' % snapfile -+ print('snapshot saved (%s)' % snapfile) - else: -- print "The answer to %s is 42." % event.key -+ print("The answer to %s is 42." % event.key) - - - if __name__ == "__main__": -@@ -356,11 +356,11 @@ - countfile = outputname + ".count.bin" - - print("visu_hp2p configuration:") -- print(" DATAFILE : %s"%resfile) -- print(" BIN_TIMER_FILE : %s"%resfile_time) -- print(" HOSTFILE : %s"%hostfile) -- print(" Bad nodes to display: %d"%k) -- print(" GUI resolution : %s"%resolution) -+ print((" DATAFILE : %s"%resfile)) -+ print((" BIN_TIMER_FILE : %s"%resfile_time)) -+ print((" HOSTFILE : %s"%hostfile)) -+ print((" Bad nodes to display: %d"%k)) -+ print((" GUI resolution : %s"%resolution)) - - hostname_per_line = 4 # for GUI layout - refresh_in_sec = 60 -@@ -377,7 +377,7 @@ - # wait for resfile - while not os.path.exists(resfile) : - time.sleep(5) -- print "Waiting for input files..." -+ print("Waiting for input files...") - - # add callback on key press event - cid1 = fig1.canvas.mpl_connect('key_press_event', onrefresh) -Only in source/src: vizhp2p.bak -diff -u -r source.orig/src/vizhp2p_html source/src/vizhp2p_html ---- source.orig/src/vizhp2p_html 1970-01-01 01:00:01.000000000 +0100 -+++ source/src/vizhp2p_html 2021-08-24 10:41:54.799946303 +0200 -@@ -118,7 +118,7 @@ - hostfile = args.hostfile - clustername = args.clustername - if len(args.OutputName) == 0: -- print "No DATAFILE given! Please provide Hp2p output files name !" -+ print("No DATAFILE given! Please provide Hp2p output files name !") - exit(0) - else: - outputname = args.OutputName.split('.')[0] -@@ -134,13 +134,13 @@ - else: - outfile = args.outfile - -- print "%s configuration:"%commandname -- print " DATAFILE : %s"%resfile -- print " HOSTFILE : %s"%hostfile -- print " CLUSTER : %s"%clustername -- print " OUTPUTFILE : %s"%outfile -+ print("%s configuration:"%commandname) -+ print(" DATAFILE : %s"%resfile) -+ print(" HOSTFILE : %s"%hostfile) -+ print(" CLUSTER : %s"%clustername) -+ print(" OUTPUTFILE : %s"%outfile) - if not os.path.exists(resfile): -- print "%s doesn't exist...Exiting"%resfile -+ print("%s doesn't exist...Exiting"%resfile) - exit(0) - - # Data management -Only in source/src: vizhp2p_html.bak diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 79bf6f8c5083..59e259541992 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { pname = "dpkg"; - version = "1.22.0"; + version = "1.22.1"; src = fetchgit { url = "https://git.launchpad.net/ubuntu/+source/dpkg"; rev = "applied/${version}"; - hash = "sha256-q+kP0PuQyGKuKahA1/TwtJG380a/sNR433xZhxvGO9M="; + hash = "sha256-63XRO3Img+XS2F5Krb5DAw0LMhtxB+eJi754O03Lx8Q="; }; configureFlags = [ diff --git a/pkgs/tools/security/cmospwd/default.nix b/pkgs/tools/security/cmospwd/default.nix index fa04ac652074..db84fb55ba82 100644 --- a/pkgs/tools/security/cmospwd/default.nix +++ b/pkgs/tools/security/cmospwd/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8pbSl5eUsKa3JrgK/JLk0FnGXcJhKksJN3wWiDPYYvQ="; }; + makeFlags = [ "CC:=$(CC)" ]; + preConfigure = '' cd src diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 509501d52cd4..6bb2a5a0e6b7 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-11-11"; + version = "2023-11-18"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-oB28qKIvGHh/h726Wsy8C/zt3rFLBHcP5iRZe3U76U0="; + hash = "sha256-7W7HwHvRfm+nRms4H4TgB1la5OhGHv5lRHwbvjwRTMw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch b/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch index 03ddf76e8ffe..7fb7d53e352f 100644 --- a/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch +++ b/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch @@ -1,188 +1,79 @@ diff --git a/Ghidra/Debug/Debugger-gadp/build.gradle b/Ghidra/Debug/Debugger-gadp/build.gradle -index f4dbd3cd0..6108e8534 100644 +index 9e1c57faf..3a3242eb5 100644 --- a/Ghidra/Debug/Debugger-gadp/build.gradle +++ b/Ghidra/Debug/Debugger-gadp/build.gradle -@@ -23,42 +23,18 @@ apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" +@@ -18,11 +18,16 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle" + apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle" + apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" +-apply from: "${rootProject.projectDir}/gradle/debugger/hasProtobuf.gradle" ++apply plugin: 'com.google.protobuf' apply plugin: 'eclipse' -+apply plugin: 'com.google.protobuf' eclipse.project.name = 'Debug Debugger-gadp' --configurations { -- allProtocArtifacts -- protocArtifact --} -- - def platform = getCurrentPlatformName() - --dependencies { -- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe' -- -- if (isCurrentWindows()) { -- protocArtifact 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe' -- } -- if (isCurrentLinux()) { -- if (platform.endsWith("x86_64")) { -- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe' -- } -- else { -- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe' -- } -- } -- if (isCurrentMac()) { -- if (platform.endsWith("x86_64")) { -- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe' -- } -- else { -- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe' -- } +buildscript { + dependencies { + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' - } ++ } +} - -+dependencies { + dependencies { api project(':Framework-AsyncComm') api project(':Framework-Debugging') - api project(':ProposedUtils') -@@ -73,37 +49,3 @@ dependencies { - } - }*/ - --task generateProto { -- ext.srcdir = file("src/main/proto") -- ext.src = fileTree(srcdir) { -- include "**/*.proto" -- } -- ext.outdir = file("build/generated/source/proto/main/java") -- outputs.dir(outdir) -- inputs.files(src) -- dependsOn(configurations.protocArtifact) -- doLast { -- def exe = configurations.protocArtifact.first() -- if (!isCurrentWindows()) { -- exe.setExecutable(true) -- } -- exec { -- commandLine exe, "--java_out=$outdir", "-I$srcdir" -- args src -- } -- } --} -- --tasks.compileJava.dependsOn(tasks.generateProto) --tasks.eclipse.dependsOn(tasks.generateProto) --rootProject.tasks.prepDev.dependsOn(tasks.generateProto) -- --sourceSets { -- main { -- java { -- srcDir tasks.generateProto.outdir -- } -- } --} --zipSourceSubproject.dependsOn generateProto -- diff --git a/Ghidra/Debug/Debugger-isf/build.gradle b/Ghidra/Debug/Debugger-isf/build.gradle -index 6bf945c2e..3225d095d 100644 +index d135294a0..785681ca2 100644 --- a/Ghidra/Debug/Debugger-isf/build.gradle +++ b/Ghidra/Debug/Debugger-isf/build.gradle -@@ -20,42 +20,18 @@ apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" +@@ -18,11 +18,15 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle" + apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle" + apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" - - apply plugin: 'eclipse' +-apply from: "${rootProject.projectDir}/gradle/debugger/hasProtobuf.gradle" +- +apply plugin: 'com.google.protobuf' + apply plugin: 'eclipse' eclipse.project.name = 'Debug Debugger-isf' --configurations { -- allProtocArtifacts -- protocArtifact --} -- - def platform = getCurrentPlatformName() - --dependencies { -- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe' -- -- if (isCurrentWindows()) { -- protocArtifact 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe' -- } -- if (isCurrentLinux()) { -- if (platform.endsWith("x86_64")) { -- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe' -- } -- else { -- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe' -- } -- } -- if (isCurrentMac()) { -- if (platform.endsWith("x86_64")) { -- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe' -- } -- else { -- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe' -- } +buildscript { + dependencies { + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' - } ++ } +} - -+dependencies { + dependencies { api project(':Framework-AsyncComm') api project(':Framework-Debugging') - api project(':ProposedUtils') -@@ -64,40 +40,6 @@ dependencies { - testImplementation project(path: ':Framework-Debugging', configuration: 'testArtifacts') - } +diff --git a/Ghidra/Debug/Debugger-rmi-trace/build.gradle b/Ghidra/Debug/Debugger-rmi-trace/build.gradle +index eec00786e..666cccafc 100644 +--- a/Ghidra/Debug/Debugger-rmi-trace/build.gradle ++++ b/Ghidra/Debug/Debugger-rmi-trace/build.gradle +@@ -18,12 +18,17 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle" + apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle" + apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" + apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" +-apply from: "${rootProject.projectDir}/gradle/debugger/hasProtobuf.gradle" ++apply plugin: 'com.google.protobuf' + apply from: "${rootProject.projectDir}/gradle/debugger/hasPythonPackage.gradle" --task generateProto { -- ext.srcdir = file("src/main/proto") -- ext.src = fileTree(srcdir) { -- include "**/*.proto" -- } -- ext.outdir = file("build/generated/source/proto/main/java") -- outputs.dir(outdir) -- inputs.files(src) + apply plugin: 'eclipse' + eclipse.project.name = 'Debug Debugger-rmi-trace' + ++buildscript { ++ dependencies { ++ classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' ++ } ++} + dependencies { + api project(':Debugger') + } +@@ -36,7 +41,7 @@ task generateProtoPy { + ext.outdir = file("build/generated/source/proto/main/py") + outputs.dir(outdir) + inputs.files(src) - dependsOn(configurations.protocArtifact) -- doLast { -- def exe = configurations.protocArtifact.first() -- if (!isCurrentWindows()) { -- exe.setExecutable(true) -- } -- exec { -- commandLine exe, "--java_out=$outdir", "-I$srcdir" -- args src -- } -- } --} -- --tasks.compileJava.dependsOn(tasks.generateProto) --tasks.eclipse.dependsOn(tasks.generateProto) --rootProject.tasks.prepDev.dependsOn(tasks.generateProto) -- --sourceSets { -- main { -- java { -- srcDir tasks.generateProto.outdir -- } -- } --} --zipSourceSubproject.dependsOn generateProto -- - // Include buildable native source in distribution - rootProject.assembleDistribution { - from (this.project.projectDir.toString()) { ++ dependsOn(protobuf.generateProtoTasks.all()) + doLast { + def exe = configurations.protocArtifact.first() + if (!isCurrentWindows()) { diff --git a/build.gradle b/build.gradle index b0c717fb1..5f56506a5 100644 --- a/build.gradle @@ -200,3 +91,103 @@ index b0c717fb1..5f56506a5 100644 } } else { +diff --git a/gradle/debugger/hasProtobuf.gradle b/gradle/debugger/hasProtobuf.gradle +deleted file mode 100644 +index 23b4ce74b..000000000 +--- a/gradle/debugger/hasProtobuf.gradle ++++ /dev/null +@@ -1,94 +0,0 @@ +-/* ### +- * IP: GHIDRA +- * +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +-/*plugins { +- id 'com.google.protobuf' version '0.8.10' +-}*/ +- +-configurations { +- allProtocArtifacts +- protocArtifact +-} +- +-def platform = getCurrentPlatformName() +- +- +-dependencies { +- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe' +- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe' +- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe' +- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe' +- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe' +- +- if (isCurrentWindows()) { +- protocArtifact 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe' +- } +- if (isCurrentLinux()) { +- if (platform.endsWith("x86_64")) { +- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe' +- } +- else { +- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe' +- } +- } +- if (isCurrentMac()) { +- if (platform.endsWith("x86_64")) { +- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe' +- } +- else { +- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe' +- } +- } +-} +- +-/*protobuf { +- protoc { +- artifact = 'com.google.protobuf:protoc:3.21.8' +- } +-}*/ +- +-task generateProto { +- ext.srcdir = file("src/main/proto") +- ext.src = fileTree(srcdir) { +- include "**/*.proto" +- } +- ext.outdir = file("build/generated/source/proto/main/java") +- outputs.dir(outdir) +- inputs.files(src) +- dependsOn(configurations.protocArtifact) +- doLast { +- def exe = configurations.protocArtifact.first() +- if (!isCurrentWindows()) { +- exe.setExecutable(true) +- } +- exec { +- commandLine exe, "--java_out=$outdir", "-I$srcdir" +- args src +- } +- } +-} +- +-tasks.compileJava.dependsOn(tasks.generateProto) +-tasks.eclipse.dependsOn(tasks.generateProto) +-rootProject.tasks.prepDev.dependsOn(tasks.generateProto) +- +-sourceSets { +- main { +- java { +- srcDir tasks.generateProto.outdir +- } +- } +-} +-zipSourceSubproject.dependsOn generateProto diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index 16bc1dbe5cd7..50fd64656f4a 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -10,18 +10,19 @@ , icoutils , xcbuild , protobuf +, fetchurl }: let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "10.3.3"; + version = "10.4"; src = fetchFromGitHub { owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - hash = "sha256-KDSiZ/JwAqX6Obg9UD8ZQut01l/eMXbioJy//GluXn0="; + hash = "sha256-g0JM6pm1vkCh9yBB5mfrOiNrImqoyWdQcEe2g+AO6LQ="; }; gradle = gradle_7; @@ -36,24 +37,6 @@ let }; # postPatch scripts. - # Tells ghidra to use our own protoc binary instead of the prebuilt one. - fixProtoc = '' - cat >>Ghidra/Debug/Debugger-gadp/build.gradle <>Ghidra/Debug/Debugger-isf/build.gradle <>build.gradle < 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 44b672cd6e4b..6f88b96cd6ad 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.42"; + version = "6.3.43"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-6ddW6VlbWV71BERJISF67UPRcwLQY8Hpw4kf80lCNBE="; + sha256 = "sha256-IWdSxXhJFGbNTo9xqEjBJNEWB6imzdwzgnXoUbfao/g="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 8ba7f0e698af..cf24944c4030 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -654,12 +654,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "adf413fba45b298c4e16f7f1043dc69f99d2fbdb"; - sha256 = "049l894z67w9qglw2qyh09rx2hzdg8hj2ja40ksmwnavb7lmdmz9"; + rev = "58dcabe21524d8b2c4d05618ca8509dc42cc6515"; + sha256 = "1y53vavm3s3mh8rxrkd6m03idl94q54ahwcg9v6nc529g32m4rr1"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.42"; + version = "6.3.43"; }; metasploit-model = { groups = ["default"]; diff --git a/pkgs/tools/security/nitrokey-app2/default.nix b/pkgs/tools/security/nitrokey-app2/default.nix index 3d35b4d07750..a3e3a82ec234 100644 --- a/pkgs/tools/security/nitrokey-app2/default.nix +++ b/pkgs/tools/security/nitrokey-app2/default.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "nitrokey-app2"; - version = "2.1.2"; + version = "2.1.4"; pyproject = true; disabled = python3.pythonOlder "3.9"; @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Nitrokey"; repo = "nitrokey-app2"; rev = "v${version}"; - hash = "sha256-VyhIFNXxH/FohgjhBeZXoQYppP7PEz+ei0qzsWz1xhk="; + hash = "sha256-loOCa6XlLx1YEfqR0SUUalVIEPCoYsNEHFo2MIKexeA="; }; # https://github.com/Nitrokey/nitrokey-app2/issues/152 @@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/Nitrokey/nitrokey-app2"; changelog = "https://github.com/Nitrokey/nitrokey-app2/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ _999eagle ]; + maintainers = with maintainers; [ _999eagle panicgh ]; mainProgram = "nitrokeyapp"; }; } diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 709558fad508..7233a41142ed 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.130"; + version = "1.0.131"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uQg3segJamYrM8RRP5BEE7O1Jepr20ucdNUVwNllQlw="; + sha256 = "sha256-92OpvUt+0iN+UdEGjDdVCjUUlbuOjUgOjc+DGMUnx9U="; }; - cargoHash = "sha256-8DEvGRerIV9PB4uPAzFwymb67gcg9wdO8rruENR2M6Q="; + cargoHash = "sha256-FaQwxt3XcDOXlzcKEdMyE9TpmGykQOnJdxtM3EqMpfU="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/tools/system/nsc/default.nix b/pkgs/tools/system/nsc/default.nix index c3d0394c658d..bec4a3114102 100644 --- a/pkgs/tools/system/nsc/default.nix +++ b/pkgs/tools/system/nsc/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "nsc"; - version = "2.8.1"; + version = "2.8.5"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-kNfA/MQuXauQPWQhUspreqo4oOKb+qBqh9NdmQM1Q+A="; + hash = "sha256-9qsHZTbK2RCDiQ5wlo2D79GeI5dbCvL2LofPnF7f8Cc="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { "-X main.builtBy=nixpkgs" ]; - vendorHash = "sha256-8cTegiNVtGSZdf9O+KVoOgnjjMIv8w7YBSkFhk7gHfk="; + vendorHash = "sha256-B3uIFJaEsj9tpjPBiU+rXVlfcgVwZUQe3VSSoZQqBG8="; nativeBuildInputs = [ installShellFiles ]; @@ -44,7 +44,7 @@ buildGoModule rec { # the test strips table formatting from the command output in a naive way # that removes all the table characters, including '-'. # The nix build directory looks something like: - # /private/tmp/nix-build-nsc-2.8.1.drv-0/nsc_test2000598938/keys + # /private/tmp/nix-build-nsc-2.8.5.drv-0/nsc_test2000598938/keys # Then the `-` are removed from the path unintentionally and the test fails. # This should be fixed upstream to avoid mangling the path when # removing the table decorations from the command output. diff --git a/pkgs/tools/system/zps/default.nix b/pkgs/tools/system/zps/default.nix index f4003ed934d6..91ce2ed8f6a8 100644 --- a/pkgs/tools/system/zps/default.nix +++ b/pkgs/tools/system/zps/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "zps"; - version = "1.2.8"; + version = "1.2.9"; src = fetchFromGitHub { owner = "orhun"; repo = "zps"; rev = version; - hash = "sha256-t0kVMrJn+eqUUD98pp3iIK28MoLwOplLk0sYgRJkO4c="; + hash = "sha256-+evCYiTiH8tRmhvsse+49WlKGRP5XQtep7wGoCySvJ4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/zram-generator/Cargo.lock b/pkgs/tools/system/zram-generator/Cargo.lock index d061c364b270..29c643c10bd4 100644 --- a/pkgs/tools/system/zram-generator/Cargo.lock +++ b/pkgs/tools/system/zram-generator/Cargo.lock @@ -79,9 +79,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" dependencies = [ "libc", "windows-sys", @@ -107,9 +107,9 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "libc", @@ -127,9 +127,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "liboverdrop" @@ -142,9 +142,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "log" @@ -240,9 +240,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] @@ -259,9 +259,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.20" +version = "0.38.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" dependencies = [ "bitflags 2.4.1", "errno", @@ -283,9 +283,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 1db60b38a8de..98c3db975edc 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , testers , difftastic +, stdenv }: let @@ -32,6 +33,11 @@ rustPlatform.buildRustPackage rec { }; }; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + postPatch = '' patch -d $cargoDepsCopy/libmimalloc-sys-0.1.24/c_src/mimalloc \ -p1 < ${mimallocPatch} diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/tools/text/invoice2data/default.nix index fd5ead9e0c35..aed1bd2afd50 100644 --- a/pkgs/tools/text/invoice2data/default.nix +++ b/pkgs/tools/text/invoice2data/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "invoice2data"; - version = "0.4.2"; + version = "0.4.4"; format = "setuptools"; src = fetchFromGitHub { owner = "invoice-x"; repo = pname; rev = "v${version}"; - hash = "sha256-ss2h8cg0sga+lzJyQHckrZB/Eb63Oj3FkqmGqWCzCQ8="; + hash = "sha256-pAvkp8xkHYi/7ymbxaT7/Jhu44j2P8emm8GyXC6IBnI="; }; patches = [ @@ -38,6 +38,7 @@ python3.pkgs.buildPythonApplication rec { pdfminer-six pillow pyyaml + setuptools ]; makeWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index d4ed3ba55a95..7ae0de13ed9f 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.29.6"; + version = "2.29.7"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-0btFCTpVB50097yQEggpm1rmm4aciTgfdLAkczQ1mj4="; + hash = "sha256-5fOEZG+ucp9EpizNHvKzqksnDzV8x0miGSKnTelxmzs="; }; - vendorHash = "sha256-EbhLz4agDWAlALfBcGUbVNz+teUvgroxzaSN8T19AJY="; + vendorHash = "sha256-FnzuumOIvjpoDr+yBaRc8UjMDNW8mgrJiz1ZyzNW0Ts="; postInstall = '' mkdir -p $data/share/vale diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index aa8e7664e087..a2c37dfb679e 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "govc"; - version = "0.33.0"; + version = "0.33.1"; subPackages = [ "govc" ]; @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-YY/rTrL6zEhZkeaYz2yG/h2s81IefClou4abbmQuDiU="; + sha256 = "sha256-5zFyOWfVxQL/QveOlX4Xkg8FBwo8mZzR7ea2IacSrS4="; }; vendorHash = "sha256-DBcovHOOfIy4dfi8U9zaCUzz5Zz8oIG44JCqMKtdxgg="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0e320b4bbf8..bd84e39bbe2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8462,8 +8462,6 @@ with pkgs; fornalder = callPackage ../applications/version-management/fornalder { }; - free42 = callPackage ../applications/misc/free42 { }; - galen = callPackage ../development/tools/galen { }; gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { }; @@ -19839,8 +19837,7 @@ with pkgs; qtcreator = qt6Packages.callPackage ../development/tools/qtcreator { inherit (linuxPackages) perf; - stdenv = llvmPackages_14.stdenv; - llvmPackages = llvmPackages_14; + stdenv = llvmPackages.stdenv; }; qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ; @@ -28109,6 +28106,7 @@ with pkgs; linuxPackages_testing = linuxKernel.packages.linux_testing; linux_testing = linuxKernel.kernels.linux_testing; + # FIXME: Remove and alias to `linux(Packages)_testing`` after 23.11 is released linuxPackages_testing_bcachefs = linuxKernel.packages.linux_testing_bcachefs; linux_testing_bcachefs = linuxKernel.kernels.linux_testing_bcachefs; @@ -32529,8 +32527,6 @@ with pkgs; noson = libsForQt5.callPackage ../applications/audio/noson { }; - offpunk = callPackage ../applications/networking/browsers/offpunk { }; - owl-compositor = callPackage ../applications/window-managers/owl { }; p2pool = callPackage ../applications/misc/p2pool { }; @@ -33103,7 +33099,7 @@ with pkgs; CoreMediaIO QuartzCore AppKit CoreWLAN WebKit IOKit GSS MediaPlayer IOSurface Metal MetalKit; stdenv = if stdenv.isDarwin - then darwin.apple_sdk_11_0.stdenv + then overrideLibcxx darwin.apple_sdk_11_0.llvmPackages_12.stdenv else stdenv; # telegram-desktop has random crashes when jemalloc is built with gcc. @@ -33442,9 +33438,7 @@ with pkgs; linuxsampler = callPackage ../applications/audio/linuxsampler { }; - llpp = callPackage ../applications/misc/llpp { - inherit (ocaml-ng.ocamlPackages_4_14) ocaml; - }; + llpp = callPackage ../applications/misc/llpp { }; lls = callPackage ../applications/networking/lls { }; @@ -40218,6 +40212,10 @@ with pkgs; cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { }; + dcp375cwlpr = (pkgsi686Linux.callPackage ../misc/cups/drivers/brother/dcp375cw { }).driver; + + dcp375cw-cupswrapper = (callPackage ../misc/cups/drivers/brother/dcp375cw { }).cupswrapper; + dcp9020cdwlpr = (pkgsi686Linux.callPackage ../misc/cups/drivers/brother/dcp9020cdw { }).driver; dcp9020cdw-cupswrapper = (callPackage ../misc/cups/drivers/brother/dcp9020cdw { }).cupswrapper; @@ -41032,6 +41030,9 @@ with pkgs; hll2390dw-cups = callPackage ../misc/cups/drivers/hll2390dw-cups { }; + mfc465cncupswrapper = callPackage ../misc/cups/drivers/brother/mfc465cncupswrapper { }; + mfc465cnlpr = callPackage ../misc/cups/drivers/brother/mfc465cnlpr { }; + mfcj470dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj470dwcupswrapper { }; mfcj470dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj470dwlpr { }; @@ -41974,7 +41975,7 @@ with pkgs; bottom = darwin.apple_sdk_11_0.callPackage ../tools/system/bottom { }; cagebreak = callPackage ../applications/window-managers/cagebreak { - wlroots = wlroots_0_15; + wlroots = wlroots_0_16; }; psftools = callPackage ../os-specific/linux/psftools { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 2cd4319e6650..12ad5a678f21 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -201,6 +201,7 @@ in { then latest else testing; + # FIXME: Remove after 23.11 is released linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix { # Pinned on the last version which Kent's commits can be cleany rebased up. kernel = linux_6_5; @@ -612,6 +613,7 @@ in { # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. linux_testing = packagesFor kernels.linux_testing; + # FIXME: Remove after 23.11 is released linux_testing_bcachefs = recurseIntoAttrs (packagesFor kernels.linux_testing_bcachefs); linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened); diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 47484eaf80f5..eafccffef9c9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -772,7 +772,7 @@ with self; { }; propagatedBuildInputs = [ ExceptionClass Tk X11ProtocolOther XMLSimple ]; buildInputs = [ DataDump FileWhich Readonly TestDifferences TestTrap ]; - preCheck = "rm t/30cluster.t"; # do not run failing tests + preCheck = "rm t/30cluster.t t/15config.t"; # do not run failing tests postInstall = '' mkdir -p $out/share/bash-completion/completions mv $out/bin/clusterssh_bash_completion.dist \ @@ -5619,10 +5619,14 @@ with self; { url = "mirror://cpan/authors/id/S/SP/SPROUT/CSS-DOM-0.17.tar.gz"; hash = "sha256-Zbl46/PDmF5V7jK7baHp+upJSoXTAFxjuux+lphZ8CY="; }; + + patches = [ + # Replace apostrophe as package separator + # https://rt.cpan.org/Public/Bug/Display.html?id=146661 + ../development/perl-modules/CSSDOM-replace-apostrophe.patch + ]; + propagatedBuildInputs = [ Clone ]; - preCheck = '' - rm t/css-dom.t # Remove test that fails due to deprecated package separator warning - ''; meta = { description = "Document Object Model for Cascading Style Sheets"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -8840,6 +8844,19 @@ with self; { }; }; + ENVUtil = buildPerlPackage { + pname = "ENV-Util"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GA/GARU/ENV-Util-0.03.tar.gz"; + hash = "sha256-B1574ehSxD6wiGYvr978FS9O9WyEPB4F2QDaGQb3P60="; + }; + meta = { + description = "Parse prefixed environment variables and dotnev (.env) files into Perl"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Error = buildPerlModule { pname = "Error"; version = "0.17029"; @@ -18904,6 +18921,20 @@ with self; { }; }; + NetNVD = buildPerlPackage { + pname = "Net-NVD"; + version = "0.0.3"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GA/GARU/Net-NVD-0.0.3.tar.gz"; + hash = "sha256-uKZXEg+UsO7R2OvbA4i8M2DSj6Xw+CNrnNjNrovv5Bg="; + }; + propagatedBuildInputs = [ IOSocketSSL JSON ]; + meta = { + description = "Query CVE data from NIST's NVD (National Vulnerability Database)"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NetOAuth = buildPerlModule { pname = "Net-OAuth"; version = "0.28"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a2f0fea4627..13bd7d07d53a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3441,6 +3441,8 @@ self: super: with self; { ecdsa = callPackage ../development/python-modules/ecdsa { }; + echo = callPackage ../development/python-modules/echo { }; + ecoaliface = callPackage ../development/python-modules/ecoaliface { }; ecos = callPackage ../development/python-modules/ecos { }; @@ -3803,6 +3805,8 @@ self: super: with self; { fastapi-mail = callPackage ../development/python-modules/fastapi-mail { }; + fast-histogram = callPackage ../development/python-modules/fast-histogram { }; + fastavro = callPackage ../development/python-modules/fastavro { }; fastbencode = callPackage ../development/python-modules/fastbencode { }; @@ -4508,6 +4512,8 @@ self: super: with self; { glom = callPackage ../development/python-modules/glom { }; + glueviz = callPackage ../development/python-modules/glueviz { }; + glymur = callPackage ../development/python-modules/glymur { }; gmpy2 = callPackage ../development/python-modules/gmpy2 { }; @@ -5324,6 +5330,8 @@ self: super: with self; { imgsize = callPackage ../development/python-modules/imgsize { }; + imgtool = callPackage ../development/python-modules/imgtool { }; + iminuit = callPackage ../development/python-modules/iminuit { }; immutabledict = callPackage ../development/python-modules/immutabledict { }; @@ -6354,6 +6362,8 @@ self: super: with self; { linkify-it-py = callPackage ../development/python-modules/linkify-it-py { }; + linknlink = callPackage ../development/python-modules/linknlink { }; + linode-api = callPackage ../development/python-modules/linode-api { }; linode = callPackage ../development/python-modules/linode { }; @@ -6885,6 +6895,8 @@ self: super: with self; { mitmproxy = callPackage ../development/python-modules/mitmproxy { }; + mitmproxy-macos = callPackage ../development/python-modules/mitmproxy-macos { }; + mitmproxy-rs = callPackage ../development/python-modules/mitmproxy-rs { }; mitmproxy-wireguard = callPackage ../development/python-modules/mitmproxy-wireguard { }; @@ -7070,6 +7082,8 @@ self: super: with self; { mplleaflet = callPackage ../development/python-modules/mplleaflet { }; + mpl-scatter-density = callPackage ../development/python-modules/mpl-scatter-density { }; + mpmath = callPackage ../development/python-modules/mpmath { }; mpris-server = callPackage ../development/python-modules/mpris-server { }; @@ -8456,10 +8470,7 @@ self: super: with self; { openai-triton-bin = callPackage ../development/python-modules/openai-triton/bin.nix { }; - openai-whisper = callPackage ../development/python-modules/openai-whisper { - inherit (pkgs.config) cudaSupport; - openai-triton = self.openai-triton-cuda; - }; + openai-whisper = callPackage ../development/python-modules/openai-whisper { }; openant = callPackage ../development/python-modules/openant { }; @@ -9692,6 +9703,8 @@ self: super: with self; { pushover-complete = callPackage ../development/python-modules/pushover-complete { }; + pvextractor = callPackage ../development/python-modules/pvextractor { }; + pvlib = callPackage ../development/python-modules/pvlib { }; pvo = callPackage ../development/python-modules/pvo { };