diff options
111 files changed, 1435 insertions, 1165 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b8ad4e9724c..b0fc2f21ef2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4604,6 +4604,12 @@ githubId = 54799; name = "Edward Tjörnhammar"; }; + ee2500 = { + email = "earthengine@skiff.com"; + github = "ee2500"; + githubId = 134107129; + name = "EarthEngine"; + }; eelco = { email = "edolstra+nixpkgs@gmail.com"; github = "edolstra"; diff --git a/nixos/lib/systemd-network-units.nix b/nixos/lib/systemd-network-units.nix index 20a526b9d4a..14ff0b3742e 100644 --- a/nixos/lib/systemd-network-units.nix +++ b/nixos/lib/systemd-network-units.nix @@ -95,6 +95,8 @@ in { ${concatStringsSep "\n" (map (s: "VLAN=${s}") def.vlan)} '' + optionalString (def.macvlan != [ ]) '' ${concatStringsSep "\n" (map (s: "MACVLAN=${s}") def.macvlan)} + '' + optionalString (def.macvtap != [ ]) '' + ${concatStringsSep "\n" (map (s: "MACVTAP=${s}") def.macvtap)} '' + optionalString (def.vxlan != [ ]) '' ${concatStringsSep "\n" (map (s: "VXLAN=${s}") def.vxlan)} '' + optionalString (def.tunnel != [ ]) '' diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 9950f2156a1..c5fc259e268 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -2629,238 +2629,6 @@ let ${attrsToSection def.dhcpV6Config} ''; }; - networkToUnit = name: def: - { inherit (def) enable; - text = commonMatchText def - + optionalString (def.linkConfig != { }) '' - [Link] - ${attrsToSection def.linkConfig} - '' - + '' - [Network] - '' - + attrsToSection def.networkConfig - + optionalString (def.address != [ ]) '' - ${concatStringsSep "\n" (map (s: "Address=${s}") def.address)} - '' - + optionalString (def.gateway != [ ]) '' - ${concatStringsSep "\n" (map (s: "Gateway=${s}") def.gateway)} - '' - + optionalString (def.dns != [ ]) '' - ${concatStringsSep "\n" (map (s: "DNS=${s}") def.dns)} - '' - + optionalString (def.ntp != [ ]) '' - ${concatStringsSep "\n" (map (s: "NTP=${s}") def.ntp)} - '' - + optionalString (def.bridge != [ ]) '' - ${concatStringsSep "\n" (map (s: "Bridge=${s}") def.bridge)} - '' - + optionalString (def.bond != [ ]) '' - ${concatStringsSep "\n" (map (s: "Bond=${s}") def.bond)} - '' - + optionalString (def.vrf != [ ]) '' - ${concatStringsSep "\n" (map (s: "VRF=${s}") def.vrf)} - '' - + optionalString (def.vlan != [ ]) '' - ${concatStringsSep "\n" (map (s: "VLAN=${s}") def.vlan)} - '' - + optionalString (def.macvlan != [ ]) '' - ${concatStringsSep "\n" (map (s: "MACVLAN=${s}") def.macvlan)} - '' - + optionalString (def.macvtap != [ ]) '' - ${concatStringsSep "\n" (map (s: "MACVTAP=${s}") def.macvtap)} - '' - + optionalString (def.vxlan != [ ]) '' - ${concatStringsSep "\n" (map (s: "VXLAN=${s}") def.vxlan)} - '' - + optionalString (def.tunnel != [ ]) '' - ${concatStringsSep "\n" (map (s: "Tunnel=${s}") def.tunnel)} - '' - + optionalString (def.xfrm != [ ]) '' - ${concatStringsSep "\n" (map (s: "Xfrm=${s}") def.xfrm)} - '' - + '' - - '' - + flip concatMapStrings def.addresses (x: '' - [Address] - ${attrsToSection x.addressConfig} - '') - + flip concatMapStrings def.routingPolicyRules (x: '' - [RoutingPolicyRule] - ${attrsToSection x.routingPolicyRuleConfig} - '') - + flip concatMapStrings def.routes (x: '' - [Route] - ${attrsToSection x.routeConfig} - '') - + optionalString (def.dhcpV4Config != { }) '' - [DHCPv4] - ${attrsToSection def.dhcpV4Config} - '' - + optionalString (def.dhcpV6Config != { }) '' - [DHCPv6] - ${attrsToSection def.dhcpV6Config} - '' - + optionalString (def.dhcpPrefixDelegationConfig != { }) '' - [DHCPPrefixDelegation] - ${attrsToSection def.dhcpPrefixDelegationConfig} - '' - + optionalString (def.ipv6AcceptRAConfig != { }) '' - [IPv6AcceptRA] - ${attrsToSection def.ipv6AcceptRAConfig} - '' - + optionalString (def.dhcpServerConfig != { }) '' - [DHCPServer] - ${attrsToSection def.dhcpServerConfig} - '' - + optionalString (def.ipv6SendRAConfig != { }) '' - [IPv6SendRA] - ${attrsToSection def.ipv6SendRAConfig} - '' - + flip concatMapStrings def.ipv6Prefixes (x: '' - [IPv6Prefix] - ${attrsToSection x.ipv6PrefixConfig} - '') - + flip concatMapStrings def.ipv6RoutePrefixes (x: '' - [IPv6RoutePrefix] - ${attrsToSection x.ipv6RoutePrefixConfig} - '') - + flip concatMapStrings def.dhcpServerStaticLeases (x: '' - [DHCPServerStaticLease] - ${attrsToSection x.dhcpServerStaticLeaseConfig} - '') - + optionalString (def.bridgeConfig != { }) '' - [Bridge] - ${attrsToSection def.bridgeConfig} - '' - + flip concatMapStrings def.bridgeFDBs (x: '' - [BridgeFDB] - ${attrsToSection x.bridgeFDBConfig} - '') - + flip concatMapStrings def.bridgeMDBs (x: '' - [BridgeMDB] - ${attrsToSection x.bridgeMDBConfig} - '') - + optionalString (def.lldpConfig != { }) '' - [LLDP] - ${attrsToSection def.lldpConfig} - '' - + optionalString (def.canConfig != { }) '' - [CAN] - ${attrsToSection def.canConfig} - '' - + optionalString (def.ipoIBConfig != { }) '' - [IPoIB] - ${attrsToSection def.ipoIBConfig} - '' - + optionalString (def.qdiscConfig != { }) '' - [QDisc] - ${attrsToSection def.qdiscConfig} - '' - + optionalString (def.networkEmulatorConfig != { }) '' - [NetworkEmulator] - ${attrsToSection def.networkEmulatorConfig} - '' - + optionalString (def.tokenBucketFilterConfig != { }) '' - [TokenBucketFilter] - ${attrsToSection def.tokenBucketFilterConfig} - '' - + optionalString (def.pieConfig != { }) '' - [PIE] - ${attrsToSection def.pieConfig} - '' - + optionalString (def.flowQueuePIEConfig != { }) '' - [FlowQueuePIE] - ${attrsToSection def.flowQueuePIEConfig} - '' - + optionalString (def.stochasticFairBlueConfig != { }) '' - [StochasticFairBlue] - ${attrsToSection def.stochasticFairBlueConfig} - '' - + optionalString (def.stochasticFairnessQueueingConfig != { }) '' - [StochasticFairnessQueueing] - ${attrsToSection def.stochasticFairnessQueueingConfig} - '' - + optionalString (def.bfifoConfig != { }) '' - [BFIFO] - ${attrsToSection def.bfifoConfig} - '' - + optionalString (def.pfifoConfig != { }) '' - [PFIFO] - ${attrsToSection def.pfifoConfig} - '' - + optionalString (def.pfifoHeadDropConfig != { }) '' - [PFIFOHeadDrop] - ${attrsToSection def.pfifoHeadDropConfig} - '' - + optionalString (def.pfifoFastConfig != { }) '' - [PFIFOFast] - ${attrsToSection def.pfifoFastConfig} - '' - + optionalString (def.cakeConfig != { }) '' - [CAKE] - ${attrsToSection def.cakeConfig} - '' - + optionalString (def.controlledDelayConfig != { }) '' - [ControlledDelay] - ${attrsToSection def.controlledDelayConfig} - '' - + optionalString (def.deficitRoundRobinSchedulerConfig != { }) '' - [DeficitRoundRobinScheduler] - ${attrsToSection def.deficitRoundRobinSchedulerConfig} - '' - + optionalString (def.deficitRoundRobinSchedulerClassConfig != { }) '' - [DeficitRoundRobinSchedulerClass] - ${attrsToSection def.deficitRoundRobinSchedulerClassConfig} - '' - + optionalString (def.enhancedTransmissionSelectionConfig != { }) '' - [EnhancedTransmissionSelection] - ${attrsToSection def.enhancedTransmissionSelectionConfig} - '' - + optionalString (def.genericRandomEarlyDetectionConfig != { }) '' - [GenericRandomEarlyDetection] - ${attrsToSection def.genericRandomEarlyDetectionConfig} - '' - + optionalString (def.fairQueueingControlledDelayConfig != { }) '' - [FairQueueingControlledDelay] - ${attrsToSection def.fairQueueingControlledDelayConfig} - '' - + optionalString (def.fairQueueingConfig != { }) '' - [FairQueueing] - ${attrsToSection def.fairQueueingConfig} - '' - + optionalString (def.trivialLinkEqualizerConfig != { }) '' - [TrivialLinkEqualizer] - ${attrsToSection def.trivialLinkEqualizerConfig} - '' - + optionalString (def.hierarchyTokenBucketConfig != { }) '' - [HierarchyTokenBucket] - ${attrsToSection def.hierarchyTokenBucketConfig} - '' - + optionalString (def.hierarchyTokenBucketClassConfig != { }) '' - [HierarchyTokenBucketClass] - ${attrsToSection def.hierarchyTokenBucketClassConfig} - '' - + optionalString (def.heavyHitterFilterConfig != { }) '' - [HeavyHitterFilter] - ${attrsToSection def.heavyHitterFilterConfig} - '' - + optionalString (def.quickFairQueueingConfig != { }) '' - [QuickFairQueueing] - ${attrsToSection def.quickFairQueueingConfig} - '' - + optionalString (def.quickFairQueueingConfigClass != { }) '' - [QuickFairQueueingClass] - ${attrsToSection def.quickFairQueueingConfigClass} - '' - + flip concatMapStrings def.bridgeVLANs (x: '' - [BridgeVLAN] - ${attrsToSection x.bridgeVLANConfig} - '') - + def.extraConfig; - }; - mkUnitFiles = prefix: cfg: listToAttrs (map (name: { name = "${prefix}systemd/network/${name}"; value.source = "${cfg.units.${name}.unit}/${name}"; diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index a1ab7093857..b041b8951fa 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -98,10 +98,13 @@ in type = types.path; # Dimensions are 48x48 to match GDM logo default = "${nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png"; - defaultText = literalExpression ''pkgs.fetchurl { - url = "https://nixos.org/logo/nixos-hires.png"; - sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si"; - }''; + defaultText = literalExpression ''"''${nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png"''; + example = literalExpression '' + pkgs.fetchurl { + url = "https://nixos.org/logo/nixos-hires.png"; + sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si"; + } + ''; description = lib.mdDoc '' Logo which is displayed on the splash screen. ''; @@ -134,6 +137,13 @@ in # XXX: Needed because we supply a different set of plugins in initrd. environment.etc."plymouth/plugins".source = "${plymouth}/lib/plymouth"; + systemd.tmpfiles.rules = [ + "d /run/plymouth 0755 root root 0 -" + "L+ /run/plymouth/plymouthd.defaults - - - - /etc/plymouth/plymouthd.defaults" + "L+ /run/plymouth/themes - - - - /etc/plymouth/themes" + "L+ /run/plymouth/plugins - - - - /etc/plymouth/plugins" + ]; + systemd.packages = [ plymouth ]; systemd.services.plymouth-kexec.wantedBy = [ "kexec.target" ]; @@ -160,8 +170,8 @@ in contents = { # Files "/etc/plymouth/plymouthd.conf".source = configFile; - "/etc/plymouth/plymouthd.defaults".source = "${plymouth}/share/plymouth/plymouthd.defaults"; "/etc/plymouth/logo.png".source = cfg.logo; + "/etc/plymouth/plymouthd.defaults".source = "${plymouth}/share/plymouth/plymouthd.defaults"; # Directories "/etc/plymouth/plugins".source = pkgs.runCommand "plymouth-initrd-plugins" {} '' # Check if the actual requested theme is here @@ -174,8 +184,8 @@ in mkdir -p $out/renderers # module might come from a theme - cp ${themesEnv}/lib/plymouth/{text,details,label,$moduleName}.so $out - cp ${plymouth}/lib/plymouth/renderers/{drm,frame-buffer}.so $out/renderers + cp ${themesEnv}/lib/plymouth/*.so $out + cp ${plymouth}/lib/plymouth/renderers/*.so $out/renderers ''; "/etc/plymouth/themes".source = pkgs.runCommand "plymouth-initrd-themes" {} '' # Check if the actual requested theme is here @@ -184,19 +194,24 @@ in exit 1 fi - mkdir $out - cp -r ${themesEnv}/share/plymouth/themes/${cfg.theme} $out + mkdir -p $out/${cfg.theme} + cp -r ${themesEnv}/share/plymouth/themes/${cfg.theme}/* $out/${cfg.theme} # Copy more themes if the theme depends on others - for theme in $(grep -hRo '/etc/plymouth/themes/.*$' $out | xargs -n1 basename); do + for theme in $(grep -hRo '/share/plymouth/themes/.*$' $out | xargs -n1 basename); do if [[ -d "${themesEnv}/share/plymouth/themes/$theme" ]]; then if [[ ! -d "$out/$theme" ]]; then echo "Adding dependent theme: $theme" - cp -r "${themesEnv}/share/plymouth/themes/$theme" $out + mkdir -p "$out/$theme" + cp -r "${themesEnv}/share/plymouth/themes/$theme"/* "$out/$theme" fi else echo "Missing theme dependency: $theme" fi done + # Fixup references + for theme in $out/*/*.plymouth; do + sed -i "s,${builtins.storeDir}/.*/share/plymouth/themes,$out," "$theme" + done ''; # Fonts @@ -225,6 +240,11 @@ in plymouth-switch-root-initramfs.wantedBy = [ "halt.target" "kexec.target" "plymouth-switch-root-initramfs.service" "poweroff.target" "reboot.target" ]; plymouth-switch-root.wantedBy = [ "initrd-switch-root.target" ]; }; + # Link in runtime files before starting + services.plymouth-start.preStart = '' + mkdir -p /run/plymouth + ln -sf /etc/plymouth/{plymouthd.defaults,themes,plugins} /run/plymouth/ + ''; }; # Insert required udev rules. We take stage 2 systemd because the udev @@ -249,8 +269,8 @@ in mkdir -p $out/lib/plymouth/renderers # module might come from a theme - cp ${themesEnv}/lib/plymouth/{text,details,label,$moduleName}.so $out/lib/plymouth - cp ${plymouth}/lib/plymouth/renderers/{drm,frame-buffer}.so $out/lib/plymouth/renderers + cp ${themesEnv}/lib/plymouth/*.so $out/lib/plymouth + cp ${plymouth}/lib/plymouth/renderers/*.so $out/lib/plymouth/renderers mkdir -p $out/share/plymouth/themes cp ${plymouth}/share/plymouth/plymouthd.defaults $out/share/plymouth @@ -267,7 +287,7 @@ in chmod -R +w themes find themes -type f | while read file do - sed -i "s,/nix/.*/share/plymouth/themes,$out/share/plymouth/themes,g" $file + sed -i "s,${builtins.storeDir}/.*/share/plymouth/themes,$out/share/plymouth/themes,g" $file done # Install themes @@ -275,7 +295,7 @@ in # Install logo mkdir -p $out/etc/plymouth - cp -r -L ${themesEnv}/etc/plymouth $out + cp -r -L ${themesEnv}/etc/plymouth $out/etc # Setup font mkdir -p $out/share/fonts @@ -304,11 +324,11 @@ in boot.initrd.preLVMCommands = mkIf (!config.boot.initrd.systemd.enable) (mkAfter '' mkdir -p /etc/plymouth mkdir -p /run/plymouth + ln -s $extraUtils/etc/plymouth/logo.png /etc/plymouth/logo.png ln -s ${configFile} /etc/plymouth/plymouthd.conf - ln -s $extraUtils/share/plymouth/plymouthd.defaults /etc/plymouth/plymouthd.defaults - ln -s $extraUtils/share/plymouth/logo.png /etc/plymouth/logo.png - ln -s $extraUtils/share/plymouth/themes /etc/plymouth/themes - ln -s $extraUtils/lib/plymouth /etc/plymouth/plugins + ln -s $extraUtils/share/plymouth/plymouthd.defaults /run/plymouth/plymouthd.defaults + ln -s $extraUtils/share/plymouth/themes /run/plymouth/themes + ln -s $extraUtils/lib/plymouth /run/plymouth/plugins ln -s $extraUtils/etc/fonts /etc/fonts plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 845e7f248a7..5dd1d5c376d 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.67"; + version = "1.68"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-v/yGHWd/hhE2jDdAQhyQbZOuHSS0FSG4WlVe8Oc6tMc="; + sha256 = "sha256-mO8GrLyO7Zr9+lRy2WQ4OeRWDGmo22mPnZbajL78hJ8="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index ea54a4a55d4..7f5e26e8b29 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, makeWrapper +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, makeWrapper , SDL2, alsa-lib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }: stdenv.mkDerivation rec { @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "025fj34gq2kmkpwcswcyx7wdxb89vm944dh685zi4bxx0hz16vvk"; }; + patches = [ + (fetchpatch { + name = "CVE-2022-34927.patch"; + url = "https://github.com/milkytracker/MilkyTracker/commit/3a5474f9102cbdc10fbd9e7b1b2c8d3f3f45d91b.patch"; + hash = "sha256-YnN1Khcbct7iG7TdwxFU1XVCeKR/Zrhe+oMepvh8cRU="; + }) + ]; + postPatch = '' # https://github.com/milkytracker/MilkyTracker/issues/262 substituteInPlace CMakeLists.txt \ diff --git a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix index f6914ae11c1..c1007e07b79 100644 --- a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lightdm-slick-greeter"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "slick-greeter"; rev = version; - sha256 = "sha256-40RyGWn32ppPjsuPljGBO6o7bu2rKYBweDycRS7xAVA="; + sha256 = "sha256-OSL4Ls3bCua5ut8zWodeIH1SfevCbsS7BgBJYdcJaVE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index ec7d4e24976..3a178930f51 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.195.0"; + version = "1.196.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-7KAT7rWq4jjSz/oxw8K+WrWwJWf0Dq8cR0oyHtA4R9g="; + hash = "sha256-O037+Pm/aq/9ZPMYpWlNPa9tEilatN8OJ3oBAuk4UTs="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 763a29a503a..d7f06d94fc3 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -16,8 +16,8 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.05.31", - "hash": "sha256-N+ypCg9Tmg+/Y7KMXTZR4aiRqbsHZwKIUidVPthEJvI=" + "rev": "2023.07.05", + "hash": "sha256-+FZjmrB8t7WM3XALqT+jvTSbBYIVLav4zSSCvMr5r+U=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -31,8 +31,8 @@ }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2023.05.31", - "hash": "sha256-z0RGk0/oWTPpp/VSM4PBPLWIIQ5cVkQXlQyciW++SH0=" + "rev": "2023.07.05", + "hash": "sha256-dvo4lariMl/FMSp6VJEAk/Zhaz2fdBxe7aKw229DxKw=" }, "Python-for-Lazarus": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 7be6120bd5a..7d001f96b99 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -173,24 +173,24 @@ final: prev: LazyVim = buildVimPluginFrom2Nix { pname = "LazyVim"; - version = "2023-07-04"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "0b020dc37b30fd93a199f1124a95028cb544eac7"; - sha256 = "19w7j41xbvy4fcbd2jgmi1jh77bil9cnp64vflfdc3fal2s90mxa"; + rev = "abea2807ce13c994d5697f0ff19d80f85f678b1b"; + sha256 = "0wiwh3kis2xs3z006b41c8d8ljl4id4l2hqp9cz2l8gw90g7vicb"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2023-07-04"; + version = "2023-07-07"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "e9287c46952a9c434fee71538e5addd5e632f4cb"; - sha256 = "1vv14p5ysfpc0py0dgvm5hda57cb4nzyqn3mn8brqz91703accns"; + rev = "5d94b8ce87c8e9eff7d3b9476b2657c081d0e853"; + sha256 = "178jvc7gdw57afniisllmi2sn31diclpxglc0dkhdd4q9z3qpapm"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-06-30"; + version = "2023-07-05"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "0ba3914a03a4689441170d6b6796500a09b5c189"; - sha256 = "1bh5idm700li7757il9k2wk6i84n7ghxz9753gz9d1bdw9rxkg7b"; + rev = "2c14f75d92d2e68392b4b9957a02040b28004779"; + sha256 = "1hshbzchifqvck03nrvzy1687hzhsvgxi2wv29czs1dly2d8c74m"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -377,12 +377,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-07-03"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "8f8ec15692fe834148ebe13eda2b711bb2309c6f"; - sha256 = "0cmmnlpjyqq6994qwm7fsnhxhn2r5vcxa8wgmsgh0hi30nncs2jx"; + rev = "b3906e4eaf53c5931b33c9cd26a847093642a5e7"; + sha256 = "0svg2n2l680zaszr3r16rrdchv7yj61kxd3b1hkqzh6sj14chr36"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -449,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2023-06-27"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "f93c2e92ce28ffe2a8cbf0560c5af3e05d7a7aa2"; - sha256 = "110v75v0biqbvhhcjm56ka2kxds4rbym35dlmwkk9yxxi16y10i0"; + rev = "142a559acd70a4da190e36b1b05b9f1eec67acd0"; + sha256 = "1mvw668wq30zqlx1adyx9ikw86wkswaf0m22dczfh7i793457lnl"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -595,12 +595,12 @@ final: prev: aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2023-02-19"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "44d2886a9ec38abac61b4c73c2e57fb752232cfe"; - sha256 = "1kd6l0vy1mnpmchjjrmfmfizia5vs8rsnin9cdwb8awa4hlsf37h"; + rev = "7bc09736f3651c10d29b82d1a465b7f540614be1"; + sha256 = "19r8kvrl8nghk9f5wdig26kj51p3dbp0g73gcvn07sjpchbb2fm0"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -931,12 +931,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-06-13"; + version = "2023-07-05"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "c5e120848c1e505090684589b3adbedac9dcb893"; - sha256 = "0v2kalfs0xvqbpksnypab7q114s2q13d36ayyjx7anzgs085i06i"; + rev = "8cca17ea0ced3ba564e5da972a25600edafe7d7b"; + sha256 = "1fr0207nxmcdpc7whlmmryy4qs7nl5mp1p6h1qi0jv51r705xrpw"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -1675,12 +1675,12 @@ final: prev: cmp-nvim-ultisnips = buildVimPluginFrom2Nix { pname = "cmp-nvim-ultisnips"; - version = "2023-01-12"; + version = "2023-07-05"; src = fetchFromGitHub { owner = "quangnguyen30192"; repo = "cmp-nvim-ultisnips"; - rev = "43b69a235b2dc54db692049fe0d5cc60c6b58b4b"; - sha256 = "0h3xm2pclylvr923sw9g9jj6bh867n0f2c4a9ndg803wky0pxmh0"; + rev = "24bca5c3e137b28cd87442d4fc51a2b312dd99cc"; + sha256 = "0frkj8xv1jm96klsff4x2hbqbbyxbfz9iaxq3wx1bldhdb71r88r"; }; meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/"; }; @@ -1987,12 +1987,12 @@ final: prev: codeium-vim = buildVimPluginFrom2Nix { pname = "codeium.vim"; - version = "2023-07-03"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "053edb7da8cc32d7a5daeb56d9ad47bb9c05349f"; - sha256 = "0dshmmclmc1qijac32b3pjk0pifqmi1mppmnsxz2dbmjz8s0wnm7"; + rev = "7e0054abd2e63bc295bf0ba3aba5ce0d39d11752"; + sha256 = "1fqcl3npfgzb1z1lh9fv6chsdcgih3dqb3cxwgdzr0q1ciz1xbqy"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2287,24 +2287,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-07-02"; + version = "2023-07-04"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "071b03a146b2384ef048751d1ca89b05d011009f"; - sha256 = "05xbx43d0b5pxqnlx71d368876z70814sq2i89cl72w30455va9h"; + rev = "6070a67e52212060f6b64646a254cc0c4ee29758"; + sha256 = "10p3cxlys6vfjf583y93gwab43afr1sn683mc3j9q0nchfy4dz6r"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-07-04"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "c8c143b3939f4c652ac09f88786bfd1e3a86804e"; - sha256 = "132vajsrhhqsmnak0k0ngi22qz7w58m0cr0g9cr9kp2ix20635b0"; + rev = "813bd80f2233314aa6756ae747cc9bf41d816e49"; + sha256 = "0r2sb0qfivvy26mpvkzd3xlkzmv7vydmv1kw4aqfds1zad59pn2q"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2323,12 +2323,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-07-04"; + version = "2023-07-05"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "c8c141c15d9a6e8d4d6ebff703c6e56afe220b97"; - sha256 = "0pny8f5xia01n9wj3qxdxpqdv2rxy618m7zczp1cnwib7n9zlg7j"; + rev = "6027cc975c976de5e96318cbde185e11843a8fbb"; + sha256 = "14i443hj3bk95nimwfdcrs4pajylp7ks7krmlyd47qr7f0fnabv3"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2587,12 +2587,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2023-07-03"; + version = "2023-07-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "49721ff72998a9e6cd843574dd2487726b3c5a56"; - sha256 = "07c4xdkrbc2myai7xwx69j5wj2xllr1lqrn3mkwdp3b71lm2j3wh"; + rev = "6a471522fa69ec2cabc5fdbb55f5224fe10460a8"; + sha256 = "1sm81lgwks2yakd4f511zxdn2gx817xw0qrn6jxhrkwhjy3zhgmh"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -2877,12 +2877,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-06-29"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "766a4f210e67e522659302dc6bd8a8d3b8c08c54"; - sha256 = "1fyq8d68j4n9659s1gpm7bgkx9x0y17hf5mdgh51rhcmfqx148ah"; + rev = "94f5f40543e393d9028bae9ce2fedf6da3af701a"; + sha256 = "0bbj9fr2ijcdj91qf8vw8zm4q3whb7z28mbzazwgw7wm155rg8c4"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2949,12 +2949,12 @@ final: prev: dropbar-nvim = buildVimPluginFrom2Nix { pname = "dropbar.nvim"; - version = "2023-07-04"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "499058f3f5d8bc7cc73a77b0e0dd7ba4e9fe8ab5"; - sha256 = "0l1hwya5xydhpr7zwvj3a2vr1dvmq685hrrdcjdypak9xrh5a7d7"; + rev = "62590d609c806563b9ff9a8e8818d3ce60e4a049"; + sha256 = "0pzq4vq263vwngykw1zm0p3rs7mby5q347qwr0d17kr37b3sh9m7"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3034,12 +3034,12 @@ final: prev: elixir-tools-nvim = buildVimPluginFrom2Nix { pname = "elixir-tools.nvim"; - version = "2023-06-29"; + version = "2023-07-05"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "bb9f59b2b51612bc99c2f1efbc6c5241b3213286"; - sha256 = "1q1hivrvbcf48ryldpr6g5b839fyyqz7fs750bsny2mq5v11bq2y"; + rev = "e0c713f86333faf0484543b4c50d14ce8d1de1d2"; + sha256 = "1nxydkvdypbb4q29sfq6axw1vc4554n02bmsv59h0kxlsyaa7hl1"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3288,12 +3288,12 @@ final: prev: flash-nvim = buildVimPluginFrom2Nix { pname = "flash.nvim"; - version = "2023-07-04"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "780ad57dedb464bfe8361356959b3ac5aaed533d"; - sha256 = "1vk76jgjhl2vdd0h7nf3vyx6pf7zd7kjlfai9hc6xg2s5r9cn4hz"; + rev = "21f8e9613bacb7a70ced583d4bcf04ae8067916d"; + sha256 = "0cv7q900a3rgv68n3vmh4wncvz0ghry6ypyn84xhzb0mkp0d66yf"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; @@ -3372,12 +3372,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-06-17"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "5de1b5fca5e07849b2626c8aeda81d2ba6362af1"; - sha256 = "06f48a45wdd67y7rzfrnq3ccyfnmhpzkl0gin1yfi5g7gcgbsh8v"; + rev = "7850a771c4e773dc49d63081f508d004b416c13e"; + sha256 = "0vjnhsy0bm4xz9rpxda5n2yiy37yl8h90sh15lw04yc5rwcz88wi"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3408,12 +3408,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-07-03"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "17245edcd1195ad88d60ae13fb1e90d1df9b2fc9"; - sha256 = "0n8imakzhqirgvxwhvrgp8lc2zsp1xkyc4pajv4clyjlm4shjzvi"; + rev = "a94db1ee6ddfd238e725b0f90163fdd65d382464"; + sha256 = "0y8lrwnrm3xza6mh329fd3xcnwmiqlvsycksiqr3am8gjmd3ir4z"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3516,12 +3516,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-07-04"; + version = "2023-07-07"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "6363b14efe02d2fbb42858132606b24e15b5a78e"; - sha256 = "0bgkagw10sgyf7bv9qp47spdwa9jz9vwlfvmdk3cj07zh46yvzvx"; + rev = "d04bbd91d2d96869071d965564aae34cae103ca1"; + sha256 = "0b94m1sb3mwkw8zh82f2i7v3irz67b18g1c0khch1vkh710kdqcs"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3744,12 +3744,12 @@ final: prev: go-nvim = buildVimPluginFrom2Nix { pname = "go.nvim"; - version = "2023-06-21"; + version = "2023-07-07"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "97b76f3188c64d4dacfc17c7c1543f775a3fb8e8"; - sha256 = "0pp5p9fwy7jwwk8k7vz8y4irggnxhzfqs1c7ka98cmxdy8234lrs"; + rev = "6550ddf5ce491d17af009c397aceb25310566eaa"; + sha256 = "01im6m0h7pa04dzh0daxkll5y1i7zf5kxlj01cribghl04zlhdxc"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -3947,12 +3947,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-07-02"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "415e184f7f534952664db723ca23edc11b149858"; - sha256 = "1f9yxz1iqp25ks8910wxcl08ncawbzxxsspzmimwxy258zwjmgiv"; + rev = "a258726a71cf9f874ba997f49929360232a1eda4"; + sha256 = "16qxzxaa19kv62s3qxbyplrxb30b2gagz2n72v3pdmf57fgwssl8"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3995,12 +3995,12 @@ final: prev: heirline-nvim = buildVimPluginFrom2Nix { pname = "heirline.nvim"; - version = "2023-05-17"; + version = "2023-07-05"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "2a151df2dc870e79b138a59ebaaaddf3d1b0d703"; - sha256 = "1sx2nl6w78m03n0aipv8v9r5w32zivx24ljfa6m00ni39acm0d1a"; + rev = "76136ccd93ed608e8109762f032cf1118981ebbd"; + sha256 = "09mqjrbzhfbfs6n1hg4dv5kfr1xbwbq5qhd8b52550bs6a43r9bg"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; @@ -4246,12 +4246,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2023-05-30"; + version = "2023-07-07"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "7075d7861f7a6bbf0de0298c83f8a13195e6ec01"; - sha256 = "0hcjr1a4vasjvgs8w7hpg0rdfr2aji6n376g062xjynh0302826q"; + rev = "4541d690816cb99a7fc248f1486aa87f3abce91c"; + sha256 = "1f83fwbd97a26wsnfilv7fq2a3vb19yi5012j4xsmbyv329i3wvr"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -4463,12 +4463,12 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2023-07-02"; + version = "2023-07-05"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "88ebda5043ec13a6e6f0ac20b279dc12ecc10311"; - sha256 = "1pxi7xi1svwfjxp4mc2jw451cm576bcydxkbw83bxvk9h4zyngwg"; + rev = "69dd4b076b9b4f863647b424f856bbe6d5ba0cd4"; + sha256 = "1rvrm39xcm30mxxd6zbhxfqqz677d4vn55qcm0rxr08zcy431p89"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -4583,12 +4583,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-07-01"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "f8611632d0f9c6818e8eb54f9bcd1dad122b5a7f"; - sha256 = "1j4478wxn40b5j4hylpppr7ja6fdd9j7yx348ragbn92kj0vllqx"; + rev = "5af331ea65418dc9361769891921fdee4bcc837a"; + sha256 = "1sfwn7bczp15mz8risxlg5nmqyhnd6xzr5184sjsz4d0qy1gclbn"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4607,12 +4607,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2023-07-04"; + version = "2023-07-07"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "de68d366d28c4136584fe8b20723f268d7e68e42"; - sha256 = "1cnv756nmisc4prbm5snwgbsg3yz29m9mjngckykjih5fxy0ssnm"; + rev = "e80616c64506a339500bf7480801fa50b3f1b450"; + sha256 = "1sz2zkl610lw03svcgv2widwyfvvqcww9qsvbn6fbjzwg5im6z3x"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4655,12 +4655,12 @@ final: prev: legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2023-06-29"; + version = "2023-07-07"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "09beae8257a821a0ad4cc3f9178c3ba80067258c"; - sha256 = "0j0zd825bvyh1gm1hl65phd31g8s6k5hc5bz3v8nbyxr45pgm9kx"; + rev = "9327bb22e9095d05f50dd64b202c71247b958491"; + sha256 = "1n8fnx4hh59ca26vxp0k0nfcwnnc5rabcn132apg1k2qmbw7kl8d"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5110,12 +5110,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-06-29"; + version = "2023-07-05"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "105b5f7f72c13e682a3aa5d29eac2408ae513b22"; - sha256 = "1vb4crvs7dcasac7kdjqa58l2wjibm85r7hg47ia7pw258d575gc"; + rev = "a658ae2906344a1d2b9c507738e585cf68e685c7"; + sha256 = "039l4v639iy7mh1wnwd7hbylq9dpa8i4icfb91r1q6ssff54mxjy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5207,12 +5207,12 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-06-29"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "4f1c72767bec31397d59554f84096909b2887195"; - sha256 = "0bw94dqidb294xy8zkqxz4xbvpf0f311wpbxpk1zvwv19vxqvba3"; + rev = "82685fdd0f67a694b244cb058b83761f54664d68"; + sha256 = "0j8mc4mx666a2x6w4cgqsa0l8xkmaib6in2s7ks49hyd4svy7d56"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5255,12 +5255,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2023-07-04"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "5a1880bb98b6844b9e9722b2a6128733d19ed20f"; - sha256 = "0midmi1gxag8f97x8yg57riy66kq3ka3xgrk70bf2pqgy4s934lp"; + rev = "c7631d373d3ae02ef502ec6b8620a8ff36ab922e"; + sha256 = "192xaw1k2sa5m92f046g6nbp4jw3yxb8xzzk33824h03adykblcl"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -5663,12 +5663,12 @@ final: prev: neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2023-06-29"; + version = "2023-07-03"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "f765e75e7d2444629b5ace3cd7609c12251de254"; - sha256 = "0bybiksbxx5z9gwg9xivhi3bsqimkvlvdz4xmxh7pkqnbw5qq2am"; + rev = "7f6fa04dbd8e8c79d1af33bc90e856b65d8641da"; + sha256 = "1hq3gxqv5jsih4cj78y8shn5ncna3hi8mwzgkl2qjhy490vc7kpa"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5711,12 +5711,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-06-28"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "a2b1d8fb9fa4daa35d3fd9123bccccccbd4a3520"; - sha256 = "1ym0xb23kk3z2v0sgg16dj1fyqck1mslzsg7r8zaj6nn77pghr8n"; + rev = "0705c72c281626f45c78d0916151d3e2bfb53fae"; + sha256 = "09drcn241msk956qpils11dhajj2sh7f2dnrs6s2867z25112a3g"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5747,12 +5747,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-07-04"; + version = "2023-07-05"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "06113a4eec1a60553b7112934883982fef603aae"; - sha256 = "072pphkmr7c8ax5vbx8j5vhl0q9kzn1q64s52awq27jsbrpaw0wh"; + rev = "72824006f2dcf775cc498cc4a046ddd2c99d20a3"; + sha256 = "1a21ybxxw9wsx8d27bpr9zw41w3c7w471mpiv0r5zynby5a36cfl"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -5807,12 +5807,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-06-20"; + version = "2023-07-07"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "6fece1546d051a5f2a2d932d5978beec1ef920ab"; - sha256 = "1wy0kb19xw21bh893fipd6nypi0fizac6021h3spf466bvlb82dz"; + rev = "32bae172814611f82e90b696b72cac99ff8de0e9"; + sha256 = "1jq69ijpz7bf37m6kahqpqyxwdmnka7qafnrgkwrbw8bmrhvzhrx"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6191,12 +6191,12 @@ final: prev: neuron-vim = buildVimPluginFrom2Nix { pname = "neuron.vim"; - version = "2022-06-02"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "fiatjaf"; repo = "neuron.vim"; - rev = "e4e7f0b012d39d8e5dfb7d13ca199eaa130279ba"; - sha256 = "06qqbg4d0gk8d236f08sr847m5icbfknxsya2q3f52alnlpjry32"; + rev = "6a45eea4a8a42ade05f0f6aca51facc452a0adec"; + sha256 = "0pspzkl6py8k4k224580jzchg0fpzcjw2piz4jyliarzp06p1fma"; }; meta.homepage = "https://github.com/fiatjaf/neuron.vim/"; }; @@ -6371,12 +6371,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-07-04"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "07897774c3b2f14d71b2ca51f3014d1055da9657"; - sha256 = "07dmnfzqphbzk7ndjw7wkm1bchqj27006i3wh90wavwlz2w567ki"; + rev = "db09b6c691def0038c456551e4e2772186449f35"; + sha256 = "133qcapq5klinnbhvbqmww5ibwfrrqn9ysg5gjx1kg2vva7nv8p8"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -6395,12 +6395,12 @@ final: prev: nvchad = buildVimPluginFrom2Nix { pname = "nvchad"; - version = "2023-07-02"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "83aac1ecc0c84726d3aace3ed97d7001add4694b"; - sha256 = "1rd93qik41hqrgrc40b3g2jkgad1pkknic17ffpz933ps0ljz8xl"; + rev = "08f3deb9010c259dc3e6e060bbc49568cbcc50ba"; + sha256 = "0rfqpi8pbjz4yhrg08dldf4zm7id2g688afn9bpg7msbxbsvh7hf"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6539,12 +6539,12 @@ final: prev: nvim-cokeline = buildVimPluginFrom2Nix { pname = "nvim-cokeline"; - version = "2023-07-03"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "709a379255157520f29aee6bfb3d33c92b0e019a"; - sha256 = "03qzim5rj09wwd6gdjx50iivybxj5fdxfsqc8s0asbmrf26b2f4j"; + rev = "904dc18d017cdf5c7c52a6455fd2a8d6f9a8bc3b"; + sha256 = "1wbfa9g22d2hshl2v0ksg5xmjhrdclqqq7zf33d9pxxr4bp62xyp"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; @@ -6767,12 +6767,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-06-25"; + version = "2023-07-05"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "74cf01de9b0fe734054a164427a260e40a74bc60"; - sha256 = "0w2rpywdd29lg9qd4w8x0vqv1i3c4yyl74cvcvf24mwq6vxs8kmh"; + rev = "2121a3bdb9b5d8dcfdd60f0892b5a73bc280c220"; + sha256 = "1wxzqq2dz0c0m2vj61p69fra52xvqd9gc4m3wk60744hzg60kn5c"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6899,12 +6899,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-06-30"; + version = "2023-07-07"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "0011c435282f043a018e23393cae06ed926c3f4a"; - sha256 = "12b1gbzj84jj8k4q5d5lb30yh923711fi0b5fqlya73y39bzmffp"; + rev = "51739a8bc531542079698c58512feb68469f5d27"; + sha256 = "05xpc6zysb9ydkvsxjz3s7k0d5fq4ryg6fdgshfx81ns8mdrjqmh"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6983,24 +6983,24 @@ final: prev: nvim-navbuddy = buildVimPluginFrom2Nix { pname = "nvim-navbuddy"; - version = "2023-06-25"; + version = "2023-07-05"; src = fetchFromGitHub { owner = "SmiteshP"; repo = "nvim-navbuddy"; - rev = "f0a2f66cb1e0b5f7bd803c5724e4b4456b5578a6"; - sha256 = "11hma1f115rvmq4jzsfc4asy8g16y88y6hafpchwdwghhcfh7pab"; + rev = "244a4cded6f2b568403684131d148048efe4e8af"; + sha256 = "10886zx97s7nc288fxsw0w1029vf65f5qazksr8x0h97zi7m2pfk"; }; meta.homepage = "https://github.com/SmiteshP/nvim-navbuddy/"; }; nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2023-07-04"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "d046a2f6bbad220f8baa4bf9161730cfef3dd026"; - sha256 = "14a1qyimv5zwx0f6qcjkg6hqn5lyqxrybwcf91cbaq1wvn2wqlzj"; + rev = "e3b9d8a974bec71b88d5640f1c87bf5b4a7e4113"; + sha256 = "0yx03zl48djvlz4g33xgidz4av2grznl1j9dlf9nbv16xg2cn1k7"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -7115,12 +7115,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2023-06-28"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "445f21d6e73e7c62c79e45ea70a45285c2deb153"; - sha256 = "11n7fbdzw38k0l242cq2v4bsxzac7aik5s31590r0k3hifly2p4g"; + rev = "0559908210bd6da1b8c7fab5be1cfe5606fb89a2"; + sha256 = "1hwkdffxaww51j4bgxx8l4dal50ywi9pyx40k42s2b4mjkv989hq"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7235,12 +7235,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-07-04"; + version = "2023-07-07"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "896f2c76229f03d6978d29fa7b12421d7c18102f"; - sha256 = "1rapiq1vcggz3m5i1gcl2d7a2sl1w0qayx06j4s7yl99340xdllq"; + rev = "1ef286e5b0cfd17f56586a8445cd83d61647f851"; + sha256 = "0ani5vi127zyhznqzjs0ghr5x1xnlpv53443mcry1nj30wslgdia"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -7402,24 +7402,24 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2023-05-25"; + version = "2023-07-05"; src = fetchFromGitHub { owner = "haringsrob"; repo = "nvim_context_vt"; - rev = "dcfd29699e614035dd6ab863039e1c1811cace91"; - sha256 = "0k324mvnhlg4syy0ysk0n7g7q2inqn3ymfys8fx8bzvqmq029w10"; + rev = "f44f46ecad6e6983fd04dac84c5a5c03815d3427"; + sha256 = "0a8bdi6d58m5v851gkyph4qngxzsa5saizhsp1klpjnj57akz078"; }; meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; }; nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev.nvim"; - version = "2022-12-23"; + version = "2023-07-07"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "63eba53a0ed93c8495623aee194ee0d4d44162f0"; - sha256 = "00acn9iq7p00280ixwh9325wh6k4r8a1s84afwsz3a2yvsvyssrf"; + rev = "e31cbf722290b640cbf80634792fcaa27dc7b699"; + sha256 = "02krpnqg1k0hnvrhrvk2z7lb1lg38w355xs63p4i34nrmnc5fygp"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; @@ -7535,12 +7535,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-06-22"; + version = "2023-07-05"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "f97db0e46ea5e55874892ac3e3cb2fc619d74c7f"; - sha256 = "10n7a19gmakv1nk96b2zsc5d3dnzasacg53iz620s0wkixrl8lsv"; + rev = "9454a13714cf771f6c61c2abb3094c0737d9d176"; + sha256 = "12nbm4p421jcj17az0vmk4cj44ixm0v2i2i6p74llpwn7bzdza3f"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -7811,12 +7811,12 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2023-06-30"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "102c02903c74b93c705406bf362049383abc87c8"; - sha256 = "1h0d4qz14s63h0c6g2lf89bvaj6ksn75f2wsk2z326bpnlyz255k"; + rev = "bda256fab0eb66a15e8190937e417e6a14ee5d72"; + sha256 = "1rsybpshyvzrfzn4dnbhqawn7inrmsfb84rmsklf781chzfjp49l"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -8173,12 +8173,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2023-06-07"; + version = "2023-07-07"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "aea7c64bdff1073beed9bd7fddb60cce7796d7ff"; - sha256 = "08xh9x05z2zfq2ynnbkhqpgmbks940mw22x6987qf6rnqw4khp5p"; + rev = "0d4b6176ce7fee2d33a716402d47d65a35acf173"; + sha256 = "05cd2gvfix5k6gxbgnnrgz1izq0g3xik0vjbk8n1qwf5xsd1l6g7"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -8305,12 +8305,12 @@ final: prev: satellite-nvim = buildVimPluginFrom2Nix { pname = "satellite.nvim"; - version = "2023-06-30"; + version = "2023-07-07"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "18c3b4d581cb0eb1a81c00a7f0d268aab842d404"; - sha256 = "1cxazg2sb9vhssih4mrmrnj7piszb2sjd2kndvr22w9pf1j6q076"; + rev = "a414ee7b55c51a9bb8491b76e6f1d4782bae8712"; + sha256 = "1iqdgm7g3nilkxfrqnhwjz5gpsc18vvxp9i9yf876wzahbbvpfps"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; @@ -9403,12 +9403,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-07-02"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "0e0600908d1ad5ac4992fa0ab578e23e9d9d6f37"; - sha256 = "0nf1pc84mk6cncb120j6dwcynkbxf2s6crji30aq99zs92n3wi0w"; + rev = "276362a8020c6e94c7a76d49aa00d4923b0c02f3"; + sha256 = "043rrifqhg5bsksqhfdc20f96i2s2xyd6qyga4918fr75sf8hmib"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -9656,24 +9656,24 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2023-07-03"; + version = "2023-07-05"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "b84fc9905271bb0f3a45004d623731e9229b0a16"; - sha256 = "1ac4jymsy2f7ibblkb2vcbg8r0clzxkqlq2zggf6zh36vr0wj3v6"; + rev = "2249e974faed67e795ffc2ca2be13b93c5d51938"; + sha256 = "0zdlrclaf45hhryixi6ivimbhgn6v62r6y25a3xikd8vzxaxa7y2"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2023-07-01"; + version = "2023-07-05"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "d785293494c59ce0940c00b8b044fc672d2902b1"; - sha256 = "0mgiplv49yrr686fj8qh619sk9szsq8slcf556b8zw9d7m945m3i"; + rev = "284667adfff02b9a0adc65968c553c6096b543b6"; + sha256 = "0r9scw1r8vd761pqf9zl2aly70xc04h8fqy17ra49p879sx254wd"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -9872,12 +9872,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-07-04"; + version = "2023-07-07"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "12d2bc27cff3992d4530a6dec07a3762b6e2ded5"; - sha256 = "0p6ajvmc93qcjdggxa3qv4iikqylb3mzaafk9k2vh6bm8gkrgf7d"; + rev = "9fb8bc0df971de1939bae160f820b215a4db9195"; + sha256 = "1rwpynfbf4aa1ii12c6il6jcfgla4wa5gl1n8mzbhf2056d34csy"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -9968,12 +9968,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-07-03"; + version = "2023-07-05"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "705ae3a0370fea068b5c617b1633bb20381401bc"; - sha256 = "0m583v9brxgkm2xhzizv3n43z6k3j4x23gq0pqdqy00n0s6pf5sm"; + rev = "2d8b2d2003c01e1fada6ec23938f6f983540a2a5"; + sha256 = "1hrg0172p85q227x8w070jx5qglnl4wqm9n48hcg10wn9sncm6xw"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -12610,12 +12610,12 @@ final: prev: vim-markbar = buildVimPluginFrom2Nix { pname = "vim-markbar"; - version = "2022-07-10"; + version = "2023-07-04"; src = fetchFromGitHub { owner = "Yilin-Yang"; repo = "vim-markbar"; - rev = "8da283528c36a3e1c25d7c40c259f3a8082d1467"; - sha256 = "1dfvi3afqxi5142n2j9zz78mjxcnsh77v83247ax15y679ww9h64"; + rev = "8c5a4d28a4d315db3d64cc2cd3859dbad675fb66"; + sha256 = "1xg0vsijcmp4sjsk2cz3379zyhrqs7fin15gsknzgpxwnmpjfg0v"; }; meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; }; @@ -12839,12 +12839,12 @@ final: prev: vim-nerdtree-syntax-highlight = buildVimPluginFrom2Nix { pname = "vim-nerdtree-syntax-highlight"; - version = "2021-01-11"; + version = "2023-07-07"; src = fetchFromGitHub { owner = "tiagofumo"; repo = "vim-nerdtree-syntax-highlight"; - rev = "5178ee4d7f4e7761187df30bb709f703d91df18a"; - sha256 = "0i690a9sd3a9193mdm150q5yx43mihpzkm0k5glllsmnwpngrq1a"; + rev = "35e70334a2ff6e89b82a145d1ac889e82d1ddb4e"; + sha256 = "0rkr3w7mcc7ha5g6m4lg0ik52v10hrx1mn2ahxnvb30h0isdyzb8"; }; meta.homepage = "https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/"; }; @@ -12887,12 +12887,12 @@ final: prev: vim-nickel = buildVimPluginFrom2Nix { pname = "vim-nickel"; - version = "2023-06-30"; + version = "2023-07-05"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "vim-nickel"; - rev = "6e91be2605b6b83d04fbdb402f205defc748d998"; - sha256 = "0n1b6l29fffsbm1hn7fj34ky4l01a9izyshsgg7wda8wq7lk2xgr"; + rev = "535196c1e6b77e05f31a5ba50a5eaef393bbf280"; + sha256 = "042n288b6c58jihbgsxhilycx56llbqck341zw7gf8sk4sypqhhr"; }; meta.homepage = "https://github.com/nickel-lang/vim-nickel/"; }; @@ -14965,12 +14965,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-07-03"; + version = "2023-07-05"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "91fbb48c0b850684a082801138dddc941a427d38"; - sha256 = "1mh5fzc08bjpkhcwj83xpgiw9vr9087zpaspz8xj6mbaac0g7jki"; + rev = "bab96ed04dd951b22663b08c670ff33960fc6419"; + sha256 = "1mpy9wqdy3bpgsd1727pn2nxpjhhxlazfhcykccqcjnx2m1k00wa"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -15121,12 +15121,12 @@ final: prev: wiki-vim = buildVimPluginFrom2Nix { pname = "wiki.vim"; - version = "2023-07-04"; + version = "2023-07-06"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "7058ef96ae53788238f30259a3402742f8ba45c9"; - sha256 = "010s76b6z4cl25qjj0si5yix2x1spcl3fylcxp6xzkk343laxbx7"; + rev = "ba0dfb47cdd3018df2cc46ce045e93b5fbb394ca"; + sha256 = "0gchas7sfb602cmwwqfbzd7g65ph1vvj1rc2rq5b828ncqin7ww5"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -15410,12 +15410,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-07-04"; + version = "2023-07-07"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "c75562cbc954136f279ced91661251543b6f2a20"; - sha256 = "15r9ybczzvz9qgz1vnhsfzzm3gm033ah9cjz1lmhbn6khkjwfbwb"; + rev = "15043d363729f1ef20e615c41bbd8b7e92c1453e"; + sha256 = "0wncps157mw0mazmz4qcv9314qbnlcvq6vglhw471i68805kqiqi"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -15434,12 +15434,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-07-03"; + version = "2023-07-07"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "f472d5e35468d5741df072b6d06376c839e65e09"; - sha256 = "0cw99qiajs2pqxww138m4cvbxsv5l2sysaw2c6zvbl7hnwbf6h50"; + rev = "a47aa0967967e2b07dce61b54645eeccf4f7a498"; + sha256 = "1440qj7bfi16ay1il60g04pcj9fpsgm772xqm3dplzlx2dkkc88f"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 82fcbf4c6b9..bc8a0e3aff7 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -269,12 +269,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=90446ed"; + version = "0.0.0+rev=c9ba632"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "90446edd3e2e1eed0cb77755a083d9ed91ddea63"; - hash = "sha256-jYD77AomQ4Wkhd6ZjcyCduFRbe2BhneuYQ9Dt/u73GI="; + rev = "c9ba632aa68d24f32d2f97e356795f45f85e6c55"; + hash = "sha256-2Wtkmlzhq+ShqFUnlofeFEN24toLaLD/O0/zSzbEZEE="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -347,12 +347,12 @@ }; dockerfile = buildGrammar { language = "dockerfile"; - version = "0.0.0+rev=fd30df6"; + version = "0.0.0+rev=c0a9d69"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-dockerfile"; - rev = "fd30df68c4178964ed012ef7f745055db76f8ebf"; - hash = "sha256-k5KQ0GfTveXadgQk0xay2QY7uCvFYneQ/0AKwZqAG48="; + rev = "c0a9d694d9bf8ab79a919f5f9c7bc9c169caf321"; + hash = "sha256-dNrLw9E3I3LqQUqYx+YUBZTlSoAp/qoOf6+RL7Lv3ew="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile"; }; @@ -491,12 +491,12 @@ }; foam = buildGrammar { language = "foam"; - version = "0.0.0+rev=0244495"; + version = "0.0.0+rev=7ef88a8"; src = fetchFromGitHub { owner = "FoamScience"; repo = "tree-sitter-foam"; - rev = "024449594c2841c944463481b741b141d1ab5727"; - hash = "sha256-GUXet7WkH4yVoLBtPmmXR4VLwQ0MjwabH2dRS963ZsY="; + rev = "7ef88a8c652073785bffd7ce9c3effc68035aa11"; + hash = "sha256-k/m1kz2/9Q15Lt6/hrKolvb29Gl0b/z2oelgkyS1wTM="; }; meta.homepage = "https://github.com/FoamScience/tree-sitter-foam"; }; @@ -711,12 +711,12 @@ }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=7ebfaf3"; + version = "0.0.0+rev=54c7da8"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-groovy"; - rev = "7ebfaf33a0f68f9283be17903ebecfdac05a1f3b"; - hash = "sha256-9Jngzug6N8agdiWHs0DMK8LyhSg0s8hWpP6kInwDPY0="; + rev = "54c7da8b167261e76c79513c0364a01836093526"; + hash = "sha256-83JIW+oOKbpqormWiNjU6uI2WAknVnUAXNFSAvdq83o="; }; meta.homepage = "https://github.com/Decodetalkers/tree-sitter-groovy"; }; @@ -799,12 +799,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=eeb138a"; + version = "0.0.0+rev=ddb6082"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "eeb138aba44de8379dae474624fef65d4288476a"; - hash = "sha256-FIf8rKxM0jTfisjHhNUm/5IXj7njCVhPOXFR8Fhr3Ek="; + rev = "ddb608219fa99d56ed98de2d60f396f575cc6590"; + hash = "sha256-UQTXdrHg4OfHnRgSAoo2gGZenE35NOypNeqUCsc4zdM="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -1008,12 +1008,12 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=8d43d90"; + version = "0.0.0+rev=2878163"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "8d43d90d568a97afee0891949d7cead3294ca94d"; - hash = "sha256-nY+tGg8aD7ayAhE5HTBsrVMyYBl1lfjXmcTTYuYTSbY="; + rev = "2878163ee7cad7eaebd3df1729e86610891fe0ee"; + hash = "sha256-BRmKlQf78MkK5d2w6J4B5p6Nos+kSon+1M95lOJEkd0="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -1175,12 +1175,12 @@ }; mermaid = buildGrammar { language = "mermaid"; - version = "0.0.0+rev=d787c66"; + version = "0.0.0+rev=e26a5f8"; src = fetchFromGitHub { owner = "monaqa"; repo = "tree-sitter-mermaid"; - rev = "d787c66276e7e95899230539f556e8b83ee16f6d"; - hash = "sha256-JwQ3jfwwOvM9eJWP/D3wXUBDysRxpa+mktYFajwA3IA="; + rev = "e26a5f8898a8174f02b4cc9a9050eb3ccfb799f3"; + hash = "sha256-qDJy2kPpx3wPl8IuhPM5ynhI2DjgutSFWAg5EQY5F+8="; }; meta.homepage = "https://github.com/monaqa/tree-sitter-mermaid"; }; @@ -1553,12 +1553,12 @@ }; racket = buildGrammar { language = "racket"; - version = "0.0.0+rev=bbdb0bf"; + version = "0.0.0+rev=92bf637"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "bbdb0bfbaf0dd5f6650b97a393a06a19cef50562"; - hash = "sha256-in/VhL0PkhOXaeiMje8oqTxYJ9/VirLTfzF9QZg/Fuk="; + rev = "92bf6372c63bb413c2d3c1535383d266838d1911"; + hash = "sha256-r/4tT+dPhyQCQfeprISH0E30hUyxSnJHpcVN/VLM6Rw="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -1663,12 +1663,12 @@ }; scheme = buildGrammar { language = "scheme"; - version = "0.0.0+rev=0c763bd"; + version = "0.0.0+rev=ca8af22"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-scheme"; - rev = "0c763bd5f85b18e354bc338d17cf1daa23b478b1"; - hash = "sha256-MHQdWH7nNBAJGLb6DN0NmpwQIIyO0+JznVPkTvryupU="; + rev = "ca8af220aaf2a80aaf609bfb0df193817e4f064b"; + hash = "sha256-m+ZFC82hWMfP0cRo64mFglS3jdya8DAQfVACNZfRfuM="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-scheme"; }; @@ -1740,12 +1740,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=5bf5e52"; + version = "0.0.0+rev=dd5fe77"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "5bf5e5256949b5d0b1bfecd9ac7ee86630760aea"; - hash = "sha256-vj5nE7fi1Y/d0rRK25qFHShpWrIFKBEHs/tVEP/gK0I="; + rev = "dd5fe7713cec874506c6f75409ce03776748b146"; + hash = "sha256-CQ7k7o1iMaUjv/5C+eY2eLANZO7lJQPhXrGEKkykaiI="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2110,12 +2110,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=b9fa34c"; + version = "0.0.0+rev=c4a42cd"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "b9fa34ca30af7ef40d35cb844fd8677872ddf0bd"; - hash = "sha256-3Fce0WD/pLRlM5hpJLvul9Q9vOE1tOky9u3yWIkL4WQ="; + rev = "c4a42cd02490e52cb9ba517f88f6636327f2bc82"; + hash = "sha256-idzWuw5MgP3ayMfKTl+sX6sOVH8Lpk4Lnkz+JUi30XI="; }; location = "libs/tree-sitter-wing"; generate = true; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 7b8cce41580..dcc2740b5ec 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -483,7 +483,7 @@ https://github.com/KeitaNakamura/neodark.vim/,, https://github.com/folke/neodev.nvim/,HEAD, https://github.com/sbdchd/neoformat/,, https://github.com/danymat/neogen/,HEAD, -https://github.com/TimUntersberger/neogit/,, +https://github.com/NeogitOrg/neogit/,, https://github.com/Shougo/neoinclude.vim/,, https://github.com/neomake/neomake/,, https://github.com/Shougo/neomru.vim/,, diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index de3f1801ef9..85909af04e9 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.4.2"; + version = "3.4.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-fTrvHf7iA3qexxdebSgzLXlngAOkdraW3KiVTVYodrY="; + sha256 = "sha256-nc8YS1PcmtM37TJpGl691SlxJliyI2gSGJtNzkWbk9A="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/entwine/default.nix b/pkgs/applications/graphics/entwine/default.nix index f9378c06ea4..908d5cc0818 100644 --- a/pkgs/applications/graphics/entwine/default.nix +++ b/pkgs/applications/graphics/entwine/default.nix @@ -7,15 +7,15 @@ , openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "entwine"; - version = "unstable-2022-08-03"; + version = "unstable-2023-04-27"; src = fetchFromGitHub { owner = "connormanning"; repo = "entwine"; - rev = "c776d51fd6ab94705b74f78b26de7f853e6ceeae"; - sha256 = "sha256-dhYJhXtfMmqQLWuV3Dux/sGTsVxCI7RXR2sPlwIry0g="; + rev = "8bd179c38e6da1688f42376b88ff30427672c4e3"; + sha256 = "sha256-RlNxTtqxQoniI1Ugj5ot0weu7ji3WqDJZpMu2n8vBkw="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/rnote/Cargo.lock b/pkgs/applications/graphics/rnote/Cargo.lock index 6dc6a470ddb..2e77a4d66e6 100644 --- a/pkgs/applications/graphics/rnote/Cargo.lock +++ b/pkgs/applications/graphics/rnote/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ "gimli", ] @@ -44,7 +44,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44" dependencies = [ "alsa-sys", - "bitflags", + "bitflags 1.3.2", "libc", "nix", ] @@ -91,15 +91,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -159,9 +159,9 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8868f09ff8cea88b079da74ae569d9b8c62a23c68c746240b704ee6f7525c89c" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" dependencies = [ "serde", ] @@ -217,7 +217,7 @@ dependencies = [ "log", "parking", "polling", - "rustix", + "rustix 0.37.22", "slab", "socket2", "waker-fn", @@ -257,7 +257,7 @@ dependencies = [ "cfg-if", "event-listener", "futures-lite", - "rustix", + "rustix 0.37.22", "signal-hook", "windows-sys 0.48.0", ] @@ -318,7 +318,7 @@ version = "0.62.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91f11671d76c2c02f3e6906bb06b13a9046cd069d095ff14a94d9c9a7bd40a20" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "itertools 0.10.5", @@ -343,7 +343,7 @@ checksum = "37823c07a43c1a8d09aaad7ba8785df1b3160dcf0ee1c4e7e83177e9ebc2d804" dependencies = [ "autocxx-engine", "env_logger 0.9.3", - "indexmap", + "indexmap 1.9.3", "syn 1.0.109", ] @@ -358,7 +358,7 @@ dependencies = [ "autocxx-parser", "cc", "cxx-gen", - "indexmap", + "indexmap 1.9.3", "indoc", "itertools 0.10.5", "log", @@ -396,7 +396,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a16532d5349c8f165534d95ce2cf70a4aefaf1f33146fe8273f77d3a2f817796" dependencies = [ - "indexmap", + "indexmap 1.9.3", "itertools 0.10.5", "log", "once_cell", @@ -410,15 +410,15 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] @@ -444,7 +444,7 @@ version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", @@ -471,6 +471,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + +[[package]] name = "block" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -521,7 +527,7 @@ version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab3603c4028a5e368d09b51c8b624b9a46edcd7c3778284077a6125af73c9f0a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-sys-rs", "glib", "libc", @@ -572,9 +578,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70d3ad08698a0568b0562f22710fe6bfc1f4a61a367c77d0398c562eadd453a" +checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" dependencies = [ "smallvec", "target-lexicon", @@ -614,9 +620,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.4" +version = "4.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80672091db20273a15cf9fdd4e47ed43b5091ec9841bf4c6145c9dfbbcae09ed" +checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a" dependencies = [ "clap_builder", "clap_derive", @@ -625,13 +631,12 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.4" +version = "4.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636" +checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", "once_cell", "strsim", @@ -655,7 +660,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -751,7 +756,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation-sys 0.6.2", "coreaudio-sys", ] @@ -878,7 +883,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -902,7 +907,7 @@ dependencies = [ "codespan-reporting", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -919,7 +924,7 @@ checksum = "a26acccf6f445af85ea056362561a24ef56cdc15fcc685f03aec50b9c702cb6d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -1052,9 +1057,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65d09067bfacaa79114679b279d7f5885b53295b1e2cfb4e79c8e4bd3d633169" +checksum = "519b83cd10f5f6e969625a409f735182bea5558cd8b64c655806ceaae36f1999" [[package]] name = "dtoa-short" @@ -1066,6 +1071,16 @@ dependencies = [ ] [[package]] +name = "earcutr" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0812b44697951d35fde8fcb0da81c9de7e809e825a66bbf1ecb79d9829d4ca3d" +dependencies = [ + "itertools 0.10.5", + "num-traits", +] + +[[package]] name = "either" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1078,70 +1093,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] -name = "encoding" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -dependencies = [ - "encoding-index-japanese", - "encoding-index-korean", - "encoding-index-simpchinese", - "encoding-index-singlebyte", - "encoding-index-tradchinese", -] - -[[package]] -name = "encoding-index-japanese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-korean" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-simpchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-singlebyte" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-tradchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding_index_tests" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" - -[[package]] name = "encoding_rs" version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1177,6 +1128,12 @@ dependencies = [ ] [[package]] +name = "equivalent" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" + +[[package]] name = "errno" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1214,15 +1171,15 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "exr" -version = "1.6.4" +version = "1.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +checksum = "85a7b44a196573e272e0cf0bcf130281c71e9a0c67062954b3323fd364bfdac9" dependencies = [ "bit_field", "flume", "half", "lebe", - "miniz_oxide 0.7.1", + "miniz_oxide", "rayon-core", "smallvec", "zune-inflate", @@ -1269,7 +1226,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -1326,7 +1283,7 @@ dependencies = [ "memmap2", "slotmap", "tinyvec", - "ttf-parser 0.19.0", + "ttf-parser 0.19.1", ] [[package]] @@ -1425,7 +1382,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -1473,7 +1430,7 @@ version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "695d6bc846438c5708b07007537b9274d883373dd30858ca881d7d71b5540717" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gdk-pixbuf-sys", "gio", "glib", @@ -1500,7 +1457,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", "gdk4-sys", @@ -1529,10 +1486,11 @@ dependencies = [ [[package]] name = "geo" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07ac450e9e7d8c08e58d2723d46bd0328bb6cc1d7b18f4f37a1e15a311098b0" +checksum = "a5d07d2288645058f3c78bc64eadd615335791cd5adb632e9865840afbc13dad" dependencies = [ + "earcutr", "float_next_after", "geo-types", "geographiclib-rs", @@ -1544,9 +1502,9 @@ dependencies = [ [[package]] name = "geo-types" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f0b3068e1537a4b861ec3734f4aa9c317d537cf0845bf6fb6221973499d26c" +checksum = "1019f6d372c5b53143f08deee4168d05c22920fe5e0f51f0dfb0e8ffb67ec11e" dependencies = [ "approx", "num-traits", @@ -1629,7 +1587,7 @@ version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6973e92937cf98689b6a054a9e56c657ed4ff76de925e36fc331a15f0c5d30a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", @@ -1662,7 +1620,7 @@ version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3fad45ba8d4d2cea612b432717e834f48031cd8853c8aaf43b2c79fec8d144b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-executor", @@ -1750,7 +1708,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "gdk4", "glib", @@ -1782,7 +1740,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", @@ -1860,6 +1818,12 @@ dependencies = [ ] [[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] name = "heapless" version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1889,15 +1853,6 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" @@ -1991,11 +1946,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] [[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] name = "indicatif" version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2051,13 +2016,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" dependencies = [ "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", + "rustix 0.38.2", "windows-sys 0.48.0", ] @@ -2086,10 +2050,19 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] name = "itoa" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" [[package]] name = "jni" @@ -2191,7 +2164,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ab9c0843f9f23ff25634df2743690c3a1faffe0a190e60c490878517eb81abf" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gdk-pixbuf", "gdk4", "gio", @@ -2220,9 +2193,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.146" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libloading" @@ -2242,8 +2215,8 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "librsvg" -version = "2.56.0" -source = "git+https://gitlab.gnome.org/GNOME/librsvg?tag=2.56.0#b831e077174ae608d8cd09e532fc0e7ce1fe5c4f" +version = "2.56.2" +source = "git+https://gitlab.gnome.org/GNOME/librsvg?tag=2.56.2#5c74c40bb3f4f7e6c347e7712e0293188e70c6ed" dependencies = [ "anyhow", "byteorder", @@ -2254,7 +2227,7 @@ dependencies = [ "clap_complete", "cssparser", "data-url", - "encoding", + "encoding_rs", "float-cmp", "gdk-pixbuf", "gio", @@ -2284,9 +2257,9 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" dependencies = [ "cc", ] @@ -2298,6 +2271,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" + +[[package]] name = "locale_config" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2433,7 +2412,7 @@ checksum = "4901771e1d44ddb37964565c654a3223ba41a594d02b8da471cc4464912b5cfa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -2444,15 +2423,6 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" @@ -2513,7 +2483,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "jni-sys", "ndk-sys", "num_enum", @@ -2548,7 +2518,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", ] @@ -2591,6 +2561,17 @@ dependencies = [ ] [[package]] +name = "num-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.23", +] + +[[package]] name = "num-integer" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2623,11 +2604,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.1", "libc", ] @@ -2689,9 +2670,9 @@ dependencies = [ [[package]] name = "object" -version = "0.30.4" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ "memchr", ] @@ -2705,7 +2686,7 @@ dependencies = [ "jni 0.20.0", "ndk", "ndk-context", - "num-derive", + "num-derive 0.3.3", "num-traits", "oboe-sys", ] @@ -2752,7 +2733,7 @@ dependencies = [ "approx", "fast-srgb8", "palette_derive", - "phf 0.11.1", + "phf 0.11.2", ] [[package]] @@ -2763,7 +2744,7 @@ checksum = "3c02bfa6b3ba8af5434fa0531bf5701f750d983d4260acd6867faca51cdc4484" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -2772,7 +2753,7 @@ version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35be456fc620e61f62dff7ff70fbd54dcbaf0a4b920c0f16de1107c47d921d48" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gio", "glib", "libc", @@ -2798,7 +2779,7 @@ version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86bf29cb1c2e73817944f66011fb12135e1c6d268e8e4c5cfc689101c25822cf" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "glib", "libc", @@ -2845,7 +2826,7 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.0", + "windows-targets 0.48.1", ] [[package]] @@ -2856,11 +2837,11 @@ checksum = "2f612055f319eb83e67841fdf00248eee26045a1759b5d94fa9c6ecce7c1e78d" dependencies = [ "approx", "arrayvec", - "bitflags", + "bitflags 1.3.2", "downcast-rs", "either", "nalgebra", - "num-derive", + "num-derive 0.3.3", "num-traits", "rustc-hash", "serde", @@ -2872,9 +2853,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" [[package]] name = "path-slash" @@ -2916,12 +2897,12 @@ dependencies = [ [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "phf_macros 0.11.1", - "phf_shared 0.11.1", + "phf_macros 0.11.2", + "phf_shared 0.11.2", ] [[package]] @@ -2966,11 +2947,11 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared 0.11.1", + "phf_shared 0.11.2", "rand 0.8.5", ] @@ -2990,15 +2971,15 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ - "phf_generator 0.11.1", - "phf_shared 0.11.1", + "phf_generator 0.11.2", + "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.23", ] [[package]] @@ -3021,9 +3002,9 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] @@ -3058,29 +3039,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -3100,11 +3081,11 @@ version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -3124,7 +3105,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "concurrent-queue", "libc", @@ -3139,7 +3120,7 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee1ec912c55fee25056d29dbe119c5f3b83ec521760f6381f01f3bd033ad7203" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "gio", "glib", @@ -3242,9 +3223,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.60" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" dependencies = [ "unicode-ident", ] @@ -3260,9 +3241,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.28" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] @@ -3413,7 +3394,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3422,7 +3403,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3464,7 +3445,7 @@ dependencies = [ [[package]] name = "rnote" -version = "0.7.0" +version = "0.7.1" dependencies = [ "anyhow", "cairo-rs", @@ -3478,7 +3459,7 @@ dependencies = [ "libadwaita", "log", "nalgebra", - "num-derive", + "num-derive 0.4.0", "num-traits", "once_cell", "parry2d-f64", @@ -3504,7 +3485,7 @@ dependencies = [ [[package]] name = "rnote-cli" -version = "0.7.0" +version = "0.7.1" dependencies = [ "anyhow", "clap", @@ -3525,7 +3506,7 @@ dependencies = [ "kurbo", "log", "nalgebra", - "num-derive", + "num-derive 0.4.0", "num-traits", "once_cell", "parry2d-f64", @@ -3557,12 +3538,12 @@ dependencies = [ "gtk4", "ijson", "image", - "itertools 0.10.5", + "itertools 0.11.0", "kurbo", "librsvg", "log", "nalgebra", - "num-derive", + "num-derive 0.4.0", "num-traits", "once_cell", "parry2d-f64", @@ -3688,23 +3669,36 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.20" +version = "0.37.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys 0.4.3", "windows-sys 0.48.0", ] [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" [[package]] name = "rustybuzz" @@ -3712,7 +3706,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytemuck", "smallvec", "ttf-parser 0.18.1", @@ -3724,9 +3718,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" [[package]] name = "safe_arch" @@ -3758,7 +3752,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cssparser", "derive_more", "fxhash", @@ -3781,29 +3775,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.164" +version = "1.0.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] name = "serde_json" -version = "1.0.97" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" +checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" dependencies = [ "itoa", "ryu", @@ -3812,9 +3806,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -4130,7 +4124,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7c73eb88fee79705268cc7b742c7bc93a7b76e092ab751d0833866970754142" dependencies = [ "arrayvec", - "bitflags", + "bitflags 1.3.2", "bytemuck", "lazy_static", "log", @@ -4172,9 +4166,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" dependencies = [ "proc-macro2", "quote", @@ -4183,9 +4177,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.0" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" +checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" dependencies = [ "cfg-expr", "heck", @@ -4196,9 +4190,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac" [[package]] name = "temp-dir" @@ -4216,7 +4210,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix", + "rustix 0.37.22", "windows-sys 0.48.0", ] @@ -4278,7 +4272,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -4331,9 +4325,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" dependencies = [ "serde", "serde_spanned", @@ -4343,20 +4337,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.19.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" dependencies = [ - "indexmap", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", @@ -4371,9 +4365,9 @@ checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" [[package]] name = "ttf-parser" -version = "0.19.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44dcf002ae3b32cd25400d6df128c5babec3927cd1eb7ce813cfff20eb6c3746" +checksum = "a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33" [[package]] name = "typenum" @@ -4458,9 +4452,9 @@ checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[package]] name = "unicode-linebreak" @@ -4468,7 +4462,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" dependencies = [ - "hashbrown", + "hashbrown 0.12.3", "regex", ] @@ -4518,9 +4512,9 @@ dependencies = [ [[package]] name = "usvg" -version = "0.34.1" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2304b933107198a910c1f3219acb65246f2b148f862703cffd51c6e62156abe" +checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6" dependencies = [ "base64", "log", @@ -4533,9 +4527,9 @@ dependencies = [ [[package]] name = "usvg-parser" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b940fea80394e3b14cb21c83fa1b8f8a41023c25929bba68bb84a76193ebed" +checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" dependencies = [ "data-url", "flate2", @@ -4551,9 +4545,9 @@ dependencies = [ [[package]] name = "usvg-text-layout" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69dfd6119f431aa7e969b4a69f9cc8b9ae37b8ae85bb26780ccfa3beaf8b71eb" +checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4" dependencies = [ "fontdb", "kurbo", @@ -4567,9 +4561,9 @@ dependencies = [ [[package]] name = "usvg-tree" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3185eb13b6e3d3cf1817d29612251cc308d5a7e5e6235362e67efe832435c6d9" +checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" dependencies = [ "rctree", "strict-num", @@ -4656,7 +4650,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", "wasm-bindgen-shared", ] @@ -4690,7 +4684,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4784,7 +4778,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.1", ] [[package]] @@ -4802,7 +4796,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.1", ] [[package]] @@ -4822,9 +4816,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm 0.48.0", "windows_aarch64_msvc 0.48.0", diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index d2a1ace9b1d..78aa102c776 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -25,20 +25,20 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - hash = "sha256-PkC2w14xM+5ai/RuF0rCUpUCxX3hFNB+fq2RkebPKGQ="; + hash = "sha256-QcgmL6lLi/3QXnlcEsVyTqNUfjSm+R+nhRzRvw8M9Qc="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "ink-stroke-modeler-rs-0.1.0" = "sha256-1abfrPehOGc/ye/iFIwYPd6HJX6P8OP2vGBSJfeo+c8="; - "librsvg-2.56.0" = "sha256-4poP7xsoylmnKaUWuJ0tnlgEMpw9iJrM3dvt4IaFi7w="; + "librsvg-2.56.2" = "sha256-uCHKDC4nc7J0k9qsmzF6etkWOoNq51Dddd9uQw5DOT0="; "piet-0.6.2" = "sha256-If0qiZkgXeLvsrECItV9/HmhTk1H52xmVO7cUsD9dcU="; }; }; diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index f8581135bb5..06cb3179821 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -12,14 +12,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sticky"; - version = "1.16"; + version = "1.17"; format = "other"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-+opzjvSdGwwn1imNzSsfD9rfs4naSXzcMBJRPhKW2WM="; + hash = "sha256-Am62Azm27irIUQEpZVY8ZP2pslH1eaiyRBdq4eSakQA="; }; postPatch = '' diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index d1a9d184083..96e77baf302 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -30,14 +30,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: mkDerivation rec { - version = "1.4.3"; + version = "1.4.4"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "sha256-6J/P/DDD17QtXAISQn77EDIYqQu1hY7EnIX0FC6H/20="; + sha256 = "sha256-i13Mt4xASneE4sBIt9fbdoFV1KnoVfaGRwQXX+1NgI4="; }; buildInputs = [ diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index 8796b2853aa..ad45adbe0a7 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.14.8"; + version = "0.14.10"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-s8wIk6M0vSRxbDLGmSZpRWEpCMcCMxyizzTpa/VsC1A="; + hash = "sha256-4T8h4KPouhjGaeeThCULilzmPs2CVGBpiqXYmtSkCO4="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-SMizkmskNFqnyI6bZYViFqGP7GLZbWoKCbeEzRjO9VQ="; + vendorHash = "sha256-a+hcd0vQ0jt3Dp+YnMORe6yIohbmpN22sOUJ6G1i4P4="; proxyVendor = true; # Exclude broken impala & hive driver diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index 203af72a7b3..f0547dcf560 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "flink"; - version = "1.17.0"; + version = "1.17.1"; src = fetchurl { url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz"; - sha256 = "sha256-x60Lk/xXf+Isg1J6z5qAIZ2/dbDiztPIKWrdPITp3Tg="; + sha256 = "sha256-HpVDS3ydi2Z1SINAUed9lni9i8FCr0SI8yBCYP4wxyM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 44ba2491588..72a8f8c23ff 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "temporal"; - version = "1.21.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-PhJLO+0JoSGS/aN6ZZoCwSypm8hihwAjsav+l4NSNZo="; + hash = "sha256-fa8UQk3E1XhMqd7E9VRYOv6RLQW8smSUw48FeYBqmSU="; }; vendorHash = "sha256-rgUdoFR7Qcp1h7v63DAWwx6NWSwWrJ6C6/b2tx2kCCw="; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index f3a1bca0625..e38fbf36e16 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.48.0"; + version = "0.48.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Grm2TlBdfRqEeyW+Mvf4lMJokctrCDscm1AmkNzcZps="; + hash = "sha256-zBjIUoH5s7Yo1qrzSY4LhxPBDcxxqZmvJt8z50FRro0="; }; vendorHash = "sha256-5Umoqi2D6iUk2Ut7YB/nmkOyA6Rx2qFhy/ZbfqoX5qA="; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 362bcf5feb1..63811d27b7e 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.241"; + version = "1.2.242"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-KEcHKMWe6t2TWbpQecpEDEdldi+9b0E5t+g+Zkhhqtw="; + hash = "sha256-cYEhqoCkJtBRQuQDViA+x5Ow5bUB5Y2lZZf18cm5ig8="; }; - vendorHash = "sha256-iP1j11bWs5Laa1f3VEt/w+NMSWhHD8Kf4cwAZiy9sRc="; + vendorHash = "sha256-tNTjPIVfviUZ4ONDyQI3M+DIzZvvPbBPdVu0Du+PIdg="; proxyVendor = true; diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix index a51e439439b..3c6f1275a29 100644 --- a/pkgs/applications/networking/cluster/zarf/default.nix +++ b/pkgs/applications/networking/cluster/zarf/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-TE7XP+qZkFxmms1iWDH8ziO8Rvkuo8cz8NdnMC/VU4s="; + hash = "sha256-TgrYDLlbaYQwRpG4Vy9sZGWawbN4iS9YFVEjlB3JVfY="; }; - vendorHash = "sha256-5HIRwOTZwElU2Ej8EhwmTtqtL6r+Hc7Vp8XjqCulo34="; + vendorHash = "sha256-dIQ+6aWI47zI++4skMFnyDYpQPcHEHSwUS9aXatY43g="; proxyVendor = true; preBuild = '' diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index d2924df2ce0..9a0b718293a 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -33,6 +33,10 @@ in buildFHSEnv { name = "dropbox"; + # dropbox-cli (i.e. nautilus-dropbox) needs the PID to confirm dropbox is running. + # Dropbox's internal limit-to-one-instance check also relies on the PID. + unsharePid = false; + targetPkgs = pkgs: with pkgs; with xorg; [ libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender libXxf86vm libxcb xkeyboardconfig diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index e6d237ee581..2bf96fcb469 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.27"; - ptb = "0.0.43"; + ptb = "0.0.44"; canary = "0.0.162"; development = "0.0.217"; } else { @@ -20,7 +20,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "tG+QR62JcBYrvJS6KU6oAWSfQFdl68AMcU8E9Zahy2A="; + sha256 = "lehrB2jTvMKIDt7QWK/UAkrzYnW5pAP4LRHfIvGpnzA="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 61180ba9be6..2bc25913e0b 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.20.2"; + version = "0.20.3"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-oxXGNmec5s4yN2SAjAUrvF2gJ9XkafwK98kDroIIssQ="; + hash = "sha256-S4j9JoY3e763Jw46nCfJYdmZd8Ryao5v/zSiP1Cz9Pc="; }; - vendorHash = "sha256-p/MnieYNLq+mleqhqCYL9PBV2dVm+Zs945RwbdKjrus="; + vendorHash = "sha256-BkBS1Gd9aZFIc1bTujYn2694SvRMF3nNCBg5i1NRwns="; inherit subPackages; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index a7b269378ea..4900b954695 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles, fetchpatch , makeWrapper , enableCmount ? true, fuse, macfuse-stubs +, librclone }: buildGoModule rec { @@ -58,6 +59,10 @@ buildGoModule rec { --prefix LD_LIBRARY_PATH : "${fuse}/lib" ''; + passthru.tests = { + inherit librclone; + }; + meta = with lib; { description = "Command line program to sync files and directories to and from major cloud storage"; homepage = "https://rclone.org"; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 9475b3cfdb7..134c3733ead 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -13,16 +13,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.23.5"; + version = "1.23.6"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-IdzgbgPpwgSDbGc2sDlQAPRWEYBRgrxs4ldP404n9FQ="; + hash = "sha256-1NULZ3i3gR5RRegHJHH3OmxXU0d293GSTcky9+B4mJ4="; }; - vendorHash = "sha256-/mRuwBS05+6ugXNdfHJIhuOJWY7zcKvdvUdcpq4rVQ0="; + vendorHash = "sha256-sj0XXEkcTfv24OuUeOoOLKHjaYMEuoh1Vg8k8T1Fp1o="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when diff --git a/pkgs/applications/radio/fm-tune/default.nix b/pkgs/applications/radio/fm-tune/default.nix new file mode 100644 index 00000000000..59c61dc4ed5 --- /dev/null +++ b/pkgs/applications/radio/fm-tune/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, liquid-dsp, soapysdr }: + +stdenv.mkDerivation rec { + pname = "fm-tune"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "viraptor"; + repo = "fm_tune"; + rev = version; + sha256 = "pwL2G1Ni1Ixw/N0diSoGGIoVrtmF92mWZ5i57OOvkX4="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ liquid-dsp soapysdr ]; + + meta = with lib; { + description = "Find initial calibration offset for SDR devices"; + longDescription = '' + fm_tune finds the initial offset for calibrating an SDR device. This is + based a given FM radio station frequency. The offset given by this tool is + not precise, but can be useful as a starting point for other tools which + cannot correct for very large errors. + ''; + homepage = "https://github.com/viraptor/fm_tune"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ viraptor ]; + mainProgram = "fm_tune"; + }; +} diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/applications/science/biology/nest/default.nix index 912fecff177..90fa6981247 100644 --- a/pkgs/applications/science/biology/nest/default.nix +++ b/pkgs/applications/science/biology/nest/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "nest"; - version = "3.4"; + version = "3.5"; src = fetchFromGitHub { owner = "nest"; repo = "nest-simulator"; rev = "v${version}"; - hash = "sha256-+wjsZxW2l0WGyGTm/6vyzPEeqCfyxJml9oP/zn6W1L0="; + hash = "sha256-PPUIXlU6noJRAa/twNSKVxPgIvbWl0OillEJRDzt+4s="; }; postPatch = '' diff --git a/pkgs/applications/science/biology/veryfasttree/default.nix b/pkgs/applications/science/biology/veryfasttree/default.nix index a5d54edce52..6f46524a5ba 100644 --- a/pkgs/applications/science/biology/veryfasttree/default.nix +++ b/pkgs/applications/science/biology/veryfasttree/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "veryfasttree"; - version = "4.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "citiususc"; repo = pname; rev = "v${version}"; - hash = "sha256-ue3/2UTIQA6av+66xvGApLi9x0kM5vAmGHHTrboOaeQ="; + hash = "sha256-fv5ovi180Osok5GYJEidjMqmL8gZKUcxrcCQ/00lvi4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index a78f04ec01c..5505ac6e1dd 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "hypnotix"; - version = "3.4"; + version = "3.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; rev = version; - hash = "sha256-Oxv70bFheKhlYyLdGcn0Hja+LAmn6RHfAh5FIjghD9o="; + hash = "sha256-qw22izmh0bQ1B1kRqkMcmEdqU665/DtLod24TUH86Ww="; }; patches = [ diff --git a/pkgs/applications/video/iina/default.nix b/pkgs/applications/video/iina/default.nix index 6377b953d5e..08df0a5a655 100644 --- a/pkgs/applications/video/iina/default.nix +++ b/pkgs/applications/video/iina/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "iina"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "https://github.com/iina/iina/releases/download/v${version}/IINA.v${version}.dmg"; - sha256 = "sha256-xkZkKiiEywUWkiFw4PbUmQsStB1iRLCNU/MY27lRjC8="; + hash = "sha256-yieAcMc3rqoURsAcc8iAbe1pohlAU3r76FsgUeiNTP8="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index 03f4b8e97ef..18338343abd 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-RwWd5O1PW93mGZRmopZn8HAVNb7cSUvnSPslRSXPzrM="; + sha256 = "sha256-8c+ifFESdNgND+93pOCwkNSvvPtzvNPtvQIp8oW6CQE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index c9c09cc07b2..bb0a26e94fb 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -202,10 +202,11 @@ stdenv.mkDerivation (finalAttrs: { ++ optional (waylandSupport && withQt5) qtwayland; env = { - LIVE555_PREFIX = if stdenv.hostPlatform.isAarch then null else live555; # vlc depends on a c11-gcc wrapper script which we don't have so we need to # set the path to the compiler BUILDCC = "${stdenv.cc}/bin/gcc"; + } // lib.optionalAttrs (!stdenv.hostPlatform.isAarch) { + LIVE555_PREFIX = live555; }; patches = [ diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index e293478116c..253339db8b0 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "24.1.4"; + version = "25.0.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 6f12de6ffbf..b36134df133 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "109dh8cz72wycjsw6phhwxgwlqnbwgjmkhhdlxjk85y78ai2kb2z"; - iosevka-aile = "1bjhczbzzid85zwbvj0m0sv32n5vi5pibaj9vigdh075ydbz6cdc"; - iosevka-curly = "0jahh3dl01dw5c9m0imqslgzf62ndyv0i743pmprr3wwsxy3lcf2"; - iosevka-curly-slab = "1xs9glwwd2vphbcxn95cv39h91hnzqwd0cc4rw4lkh2198gimq4d"; - iosevka-etoile = "0chzkq1c0qacjgg60rsi9vk04vk7gi64kshigizc2aj6viss9nkq"; - iosevka-slab = "0mxnkhc5skwqf58izjhva2g0faf7hd0bfdfn4dwfp12vl3lh2nar"; - iosevka-ss01 = "1g6350xmrvrvgg9w89p78adqn7l60f871h3pk198mf991qk50dv1"; - iosevka-ss02 = "1bpvpcb165f34gj7jcjdaczjplv5flp0f72h61p2qggfz6ladayg"; - iosevka-ss03 = "1j8p2iaj0kfr522dpvvfakvaz8rkyqjv79gsy7ml169d2f5cjysl"; - iosevka-ss04 = "1idgx93v0i116pkd2x9mvn4m55z8rf3ybjsm7z59mxqv3llxlzrx"; - iosevka-ss05 = "0kfwiznijsbsbidi96n445hks6cjxrr26q7psmb24lj1jd82m9cg"; - iosevka-ss06 = "1wiviy9ivbjba7gbc4myxkykwr793gmgbi1x0mv26di85n1m46d5"; - iosevka-ss07 = "1pnyj9h40pjpks0irw55xhp1vc3pqfxyw82j1165vvahn14vmag0"; - iosevka-ss08 = "1hsr8vazhg6qwrz38swil4hjsjn095ryv7c928yndhcnpj7r2hq3"; - iosevka-ss09 = "0y01fxwcw4dwcgrbd8552yw6g4w86smh6ggj3pc1krzam1vcm3ak"; - iosevka-ss10 = "0iwrdp1xzrvx4dx3dy87bix0kr9dailkpz9qayn8rkf6gb1v59wd"; - iosevka-ss11 = "13vhw0bzmhk61p6pljsx5hhr6p2a79ak4b1v3qsfvmlj1p2jjsm6"; - iosevka-ss12 = "09fgai57l1qi4rpwgaw18hkzyxszxxizq7yb2h9g0xzws6mrymdf"; - iosevka-ss13 = "0dnmb2r05kvjs5f9frr897d9l9g0c8zdw9azxhxf4npgw3jk5s6x"; - iosevka-ss14 = "1gc113mvnfbd9vhq6zl4zr163yw94051n09nha2ixsqqciy5z269"; - iosevka-ss15 = "14ci16l3a4zs7gmj0xl7yf5f1y0dx8x0im1gx3q1gvbqcgki1045"; - iosevka-ss16 = "0qzzmzsqiw7ndjyzy6x9sk8an667p6v0anq4pbiwyf9fxpl4zq88"; - iosevka-ss17 = "06hlcan65k5czhryfl4n3rfhh0hxhnr6ga7ghwd9lwwlx22qdvps"; - iosevka-ss18 = "1iy5whvp4260y5sihrcv9bzf36ig6ic5p6hr0622cghaw0syrzmd"; - sgr-iosevka = "1nkbn250b6yqzg9bjrl0v15v86y9dklwcvyvmr44p3nq1cwm3k3m"; - sgr-iosevka-aile = "0b0qv2b14qw38x76003c54xmy2nl2wp0qj6qcy4iglynnds389vp"; - sgr-iosevka-curly = "1566gj7dqizh8d50vjd9p7p6qgrqdzfx0vqjp7f9g0p2fksh4ybp"; - sgr-iosevka-curly-slab = "06db180ymg3jd1nbiy7r2hmyhvmgj9w27gkgg5mi68j628c5pyf2"; - sgr-iosevka-etoile = "02s6zizz4sp3wi4kxa8rc2wsah4x8lqzka2pyx1lw9g2fzk62sa8"; - sgr-iosevka-fixed = "1zhqg1lq91w39s7c0b716gzq2ckvs3y83vwdkdxjfv4y077ycxf1"; - sgr-iosevka-fixed-curly = "1q2qv212bvyf0h8wwvl4nk7cnl6j6gks2pp29akqhdk16w0as0gl"; - sgr-iosevka-fixed-curly-slab = "1ffb7kp4fhcdf7rsbm3nz0g410b07yhl515071nnsn44c8i57562"; - sgr-iosevka-fixed-slab = "1sin508j12wwgv8ar63baq06h62g2mvrqim8l0ky359iybn0jcb2"; - sgr-iosevka-fixed-ss01 = "0h8xqzn10xjp408ghqnwm5a6301v2xr3rmglnfvphc7mfy0h4ann"; - sgr-iosevka-fixed-ss02 = "12y2szhb5pkkczf1jx17z927b0vmvvf2vbg9a0i25kvvnbwr9d0p"; - sgr-iosevka-fixed-ss03 = "1nhlanzg0qfxhmp7kzhh6brh943w1ib1zlgkl0zy0d9a9amfgg72"; - sgr-iosevka-fixed-ss04 = "0jnxib9rbnin5b3vskb69pyf3v76r7ygxw32vadsjdfyfi3ya5dr"; - sgr-iosevka-fixed-ss05 = "1bl6kc0inifs54dyky7p3prq68cif1ak58m0m96my17c9snnl8g7"; - sgr-iosevka-fixed-ss06 = "0di6f2cgssax0602m8kvbvsmsr1k2h5z3bqa6jcbhw0nh3farnpq"; - sgr-iosevka-fixed-ss07 = "0spr9yvw2saklgr5cbbk3bs56kbs28jff9mxb58f24qqpzfg0k02"; - sgr-iosevka-fixed-ss08 = "1jbk0wjr0imvaw3vaf1xr6v3hmsls231x25m1j01v9j406addg64"; - sgr-iosevka-fixed-ss09 = "05vqwbcq7p0nax1lcqvdxsvsw6yr11xhw7700w51g1l6n9nja5v7"; - sgr-iosevka-fixed-ss10 = "19w18vpz18klx2530fh0r3q1rm9ik11yk1vbjnqw60d48lk97m0r"; - sgr-iosevka-fixed-ss11 = "0rvywrk92m20jm41927kr78ln38g2g7h2zgb3nk829y6nbaflm7a"; - sgr-iosevka-fixed-ss12 = "068iblb35p71w3vh5gmf5d47wc459y6s0k1y0ac5g3nsxki9wdk2"; - sgr-iosevka-fixed-ss13 = "1zx330j18wf6q539h0fbyskfb3m8vc53rkyzh7xw974xx24084l9"; - sgr-iosevka-fixed-ss14 = "1s518zmrchizb0wcyqhj1pqy7kq255qv7izgs3w3imr6a6jbh1gg"; - sgr-iosevka-fixed-ss15 = "0iimmin8k38jqg4qax3dlb5cjw9j3mww225kmdpsvfan2rnacji5"; - sgr-iosevka-fixed-ss16 = "1ngrpr9fjmv50kf9rykynx1fmzr50ny35ykm1yqanwlsb8nka8zy"; - sgr-iosevka-fixed-ss17 = "1vhqrwq8hhic7cnij8yngra5cli17pk42j4fgvaprrb44a1dsykm"; - sgr-iosevka-fixed-ss18 = "1ynvszf76bz5sjsr6dva6c2p8pcp9fakfqn6m51hapixhjp1sjr8"; - sgr-iosevka-slab = "1hs468pfg1smbkyj1as163lywbmhs0mdj4a6bri7vxj9v78012y2"; - sgr-iosevka-ss01 = "1gzrzip0qakiikn71mvzh6p3r9glip0g6ia6jflk8qvdkzm8g0pc"; - sgr-iosevka-ss02 = "0sy4l1h5i21sp5lnnxwn74nahvdgpjlip4f5d4hhp48968hnlvjy"; - sgr-iosevka-ss03 = "0z1fg1mi9lz8xby8jhwg65dg68nzklkbzl3pcl8bi0gn932k0jjs"; - sgr-iosevka-ss04 = "11f5x99kxiwzmxv2wh4lnm50k4xycz39pbdv24rxf1d9yanya2cf"; - sgr-iosevka-ss05 = "1ca9y3vj839hkdbs2vlak6rm6waks45fi8wbssr68dk00p3c1hif"; - sgr-iosevka-ss06 = "0ahqgjydsc68rc5al5js3pzhc33sl5xchgby2x1lqzkgw4zixnms"; - sgr-iosevka-ss07 = "06gvfx0j5r4qb3w6sr6rsrs9hi7n1lb7m8h4qys4ry9skam65vbs"; - sgr-iosevka-ss08 = "0l4lxrbnrzq6cin21z3dw2agrggqzl93qfiqkpc3qxqiq2mx0gqd"; - sgr-iosevka-ss09 = "0xkmrbgvh0q91zypjp4v3wg9y4kj7gzsnb4j5h4sg9z68cjr0crq"; - sgr-iosevka-ss10 = "1h190v4kyxhs3bgv98qymhi7zgll4f623bcyc62rdslf393jv0ga"; - sgr-iosevka-ss11 = "0y83v908rcf2dlqnla8xqj5fzqp6vgrbnriwhvr59kd25aa6vrg5"; - sgr-iosevka-ss12 = "16q8lwmr0fkk13494jvcv8g9v3nk9gja0njryl25ajj9awq73blc"; - sgr-iosevka-ss13 = "16l8k51iblsd2wy5ivnfji0ln9mgx23xfs6is8bg699xwzczh5ny"; - sgr-iosevka-ss14 = "0f0c9cz9g9sc7gm1gvi7lzn0if577k9g6hixx6py15r6b1ygi9rl"; - sgr-iosevka-ss15 = "08pgi4h8a13zdrcnhaxw2ywh27q7z7j9l638z80d8rbicswrcsgm"; - sgr-iosevka-ss16 = "1q6lcsqqd1lpgl29czgp86qnqsaw553lb0mj4cck09nzyr8sqfr2"; - sgr-iosevka-ss17 = "1bgvd9d82rc94j6qpgpcll4a97jkj2cmilcz9k2jfbshdpl1y04c"; - sgr-iosevka-ss18 = "1ykzsd566rphhsj2rx558f5abr3dgxxplaywl5rqcwn8ipn8wg3h"; - sgr-iosevka-term = "0kx37k548cxng6ixzb0a4cqw104wp8ija484zrhdp79nn4kx7lh7"; - sgr-iosevka-term-curly = "00wmfli99asd1lgk84l7al51mmr299yl1ijnvk08apfby8sqh9z9"; - sgr-iosevka-term-curly-slab = "0rkssp8ganiwl72sp2npv54n3n3g5vkkias45hzb3hgq62byx1ak"; - sgr-iosevka-term-slab = "019cr9mza25ljg9ws14p8inmlzdpa91nxmsgads4iicf25vc5283"; - sgr-iosevka-term-ss01 = "157p94cvab0mvfd383zxwf7bsgm9amnclxvcm0qc3fq7z7bxsm00"; - sgr-iosevka-term-ss02 = "04fvc2f2rhxnz7q6qwv7lragr5mqfja5hjaviq36q235phl9hb83"; - sgr-iosevka-term-ss03 = "0kvvgdhc7kx9ws2h2n08avgjfkp1v6zgkhlwdjnj10x0wnpqy7sz"; - sgr-iosevka-term-ss04 = "093nn0n9f4ga966v4ivm57sf85iw1m69k6k8xawam0gxkpbb5yr9"; - sgr-iosevka-term-ss05 = "0qa4w07fixpip7r7aklvjmmj095d2z8kx5945plzwrp3yw3akj8n"; - sgr-iosevka-term-ss06 = "0564kx6mvwm1rb6y5zghy7brv2mpq9h7xwjppf7f5wymyz9jizv8"; - sgr-iosevka-term-ss07 = "0mbg7mxj5di8h6sj9g7ydv2415r2xk2lsjj41l4pi8wmi9h7cmhh"; - sgr-iosevka-term-ss08 = "1pf7qq1d1dzv872jxqj9p6yivx2iicm8c34y7ll3x8lb1idgljdc"; - sgr-iosevka-term-ss09 = "1gghck5kmm57pcdpqz4nvvk56h66kpi4bj8qqjpccqdr74f628yx"; - sgr-iosevka-term-ss10 = "1i0nsq6rsj8196znh8iga40js8pvvbs5hl3zkcdz74al0r4hwrdw"; - sgr-iosevka-term-ss11 = "1czqgkvmpxcnvnk2vrpka1396bx2zn66ar1zddl92iqdxrq3imnr"; - sgr-iosevka-term-ss12 = "02bzqkwdl0pcb24xank8gql548pvdvh8395fr0ld8wwl0bd32lz8"; - sgr-iosevka-term-ss13 = "14csppx9a9wq4ql5mhfc3958dqyd2xnq76ixrdigadf8gngr8qvz"; - sgr-iosevka-term-ss14 = "07z87bmipidr69ra58q80kzpqa4rc8nhhj3lqrm9q4x0q1w8mrck"; - sgr-iosevka-term-ss15 = "0q1v2a8z6gcrwkimxc0kzq4ddvyxv2ih5k1h14d03183p186bsih"; - sgr-iosevka-term-ss16 = "14z9qvlp5cd1g03z78wpz5zqzxi44s1kdxkkwr2r666rkqy0crr0"; - sgr-iosevka-term-ss17 = "1jclbwbxlfz45m8x4adz6c2bcllza0x3x9pgnzlvcx6a8rbzk55z"; - sgr-iosevka-term-ss18 = "12abgqq8krx27b7w56gg04hv99wz0bxnx8hmd6naar1nqw97s9mq"; + iosevka = "0lx6cvaf3fqqy2mny84qhgrzmhvxipl24w7i6q7crg22fqqhcm9p"; + iosevka-aile = "14vg7xd2mibp97p5xj6xl2v7vcqzly1mbfx4nzpsygq5i8l6xixw"; + iosevka-curly = "0kc5kpxqdz27kffi0gg0qm8rw8qahkpwffqraf2956dfqa6md772"; + iosevka-curly-slab = "0pgqr4iwj0as3wnyqfyiwnp4libc7srzs36fcvxvhy4h39dmiyx7"; + iosevka-etoile = "0zhmm2pafmimgsznj60dkvjikcznlw1npjl1gvbrvlcxhs1i9bjv"; + iosevka-slab = "090yrggsx9bihaa51an2j0fxax9p47xbnrk67a9sxx2l9p70lbpw"; + iosevka-ss01 = "07cv7qj14ldnigm49y4sn96xbzsd7vl61fc2kamkg9n1zrk70376"; + iosevka-ss02 = "16zc4x3pcg1zcjn5pvy41mf21xqa6jm7ql6f7q1ls3nwda0z2v4h"; + iosevka-ss03 = "14i6c5q7p4k3n3l8wnj4jzrjc0fgp5hfj1zb4rnjbmx59yy7qvws"; + iosevka-ss04 = "0fjp92x8din0v5ml81dydif2n6zxv638y2aj10snfpixrnwryy9h"; + iosevka-ss05 = "04q0y02q7l2c4y5awfniddpx3pmskdip9r5ypzws30hsab12mghq"; + iosevka-ss06 = "08w145lrp10prhcidi0apdd0y34qdmlhfzr8xxm1mxl459g647mj"; + iosevka-ss07 = "0dz0gva0ji6zs7nxvva31z2jqawhg3vi873fwzwm4wdhp1p7m9xs"; + iosevka-ss08 = "0ylfkdxgndanii1aldfhncnp75hsprsw09fcr7xhyjj32zvzwvph"; + iosevka-ss09 = "1dz1jak3jg5jn4rdp0xcxrnbjknxqc9jwivhjp3wzdjpkkbgvyvr"; + iosevka-ss10 = "1wh0rfcp9yipjhvqcqy5n3v56s8hj5s017wr7kjk76wd0fx0sd4f"; + iosevka-ss11 = "1vfkfmq03b944nwxj32wc8anbhzfppmyj9vc6fp7c0prmqdi4a0m"; + iosevka-ss12 = "02mqw70rqqhq0c44823ip1c237bj0g52xkmx7vhggf9avnw0090z"; + iosevka-ss13 = "1zb72vx72z92vybj4yb3gggdsjz4gdrnm2k1j484x56z51d2qsbz"; + iosevka-ss14 = "1j9bhkb8qkdbm6mg2krbcxf2j9ii5vwgrq48b95zg0b2hdvabdpf"; + iosevka-ss15 = "17lffwlq5cm4ri2g1jznb0bqp1xaifrk1jcik0wl7b8y3mg27i1n"; + iosevka-ss16 = "1b27dbz585jviir5hwhwb9qg5f9cjpy6nvh7p7rd8n18ri2c7n5q"; + iosevka-ss17 = "09wijvz5b9s7kz2jpl68d2ygrf1kriaalrdhbgz7gc7rw5cvn8vd"; + iosevka-ss18 = "09wp9syfwz9dch26ldsvb14vmg1fcj68qlr6mfqj3wwykvb84835"; + sgr-iosevka = "1fcxnwynmwrd49h2wwlk2qkvrfpjwvxwlpq01j01ikschvi5smg2"; + sgr-iosevka-aile = "18ivsrxc8x2bvknqqn47swdphjldzad0fva9fab7b2jf537g9kd0"; + sgr-iosevka-curly = "0l1zi6svq8d1inp5rg8ihvm03x9wcavm6ak6xhx19lnxhca6nipx"; + sgr-iosevka-curly-slab = "1fakczd3bmld6liz9h4m9zgqvv7skjg91b4vbcqk05dqqdkpy9s4"; + sgr-iosevka-etoile = "0g236kfv3cr4swj41aiv31vwm7jxqjgkvvc1cd3riz2ikhyjry4f"; + sgr-iosevka-fixed = "0kgfimhm67kcscx0f6p9hyvav3dz3rzij25y8zb6wwc5x4kbs7q6"; + sgr-iosevka-fixed-curly = "199s7yzph0rbi78i6678g4kazmzhm63wkklmj412a8k7iqbi287y"; + sgr-iosevka-fixed-curly-slab = "1k4zb2sf8llv30aigxsv6r6ddvwdkgly6cfk0rhs5m33ram562r4"; + sgr-iosevka-fixed-slab = "05h6152fwqw99jm7lz65zid7n3b3sbxsg683yl1pm5jyqfcmjhds"; + sgr-iosevka-fixed-ss01 = "0npi71az66cgr4cv1idij8kb8q0sh03zf18frziz0gzh7rvlgp9b"; + sgr-iosevka-fixed-ss02 = "1y0xvbr8qlmn1ii71l7przqh0zl06w03300wdvsj9ncx651hvdpr"; + sgr-iosevka-fixed-ss03 = "020f2jfa6wps41jryjwim1p1xx2qdckdzf98fdcfp6gj1zag3k70"; + sgr-iosevka-fixed-ss04 = "0by2zngg1g3lklpr8xswp7bp7yaw2sxsd0cpg73bsllv73i4bzrd"; + sgr-iosevka-fixed-ss05 = "0mxl85c0g2csnckl7fqrafrvff030njw9b8c7sy34gfpvasbc51j"; + sgr-iosevka-fixed-ss06 = "1dfz4g225r5v86y5sji03x61hhaf66p1afqw9lrmsig2x04qxr1g"; + sgr-iosevka-fixed-ss07 = "02g9nfpd2xf3bn23jfpvy6vw9jlgy3hy2mphvqkq8zqa73a101dv"; + sgr-iosevka-fixed-ss08 = "1q1248gr82vq0jcmp67aknxxdkbpjqwdk5b18qrbfynwppkn8xw8"; + sgr-iosevka-fixed-ss09 = "1v2pgbw21iya9sayvhv987sm4iwxgrdfrc7raqdlb9xhln64bn0g"; + sgr-iosevka-fixed-ss10 = "1y92wiwh0d2q1ygnr8z9wkq973wqkr8g7n0n0q5kzv8y1v79i0s1"; + sgr-iosevka-fixed-ss11 = "1gnn1d0nkm8xiwv8fj28jrzmxmxi3c3p9shdvki2zpyb24f2kflv"; + sgr-iosevka-fixed-ss12 = "11h1i3i8y89k9kkvzh5jfrvyniba9l013001isk53yj9ww29hbi4"; + sgr-iosevka-fixed-ss13 = "1qgni0z0x7k3a4nsxj2nqmcxs64s2paaq1d4q6p4s77gb3v1nysb"; + sgr-iosevka-fixed-ss14 = "0ai6jx75ni5afsyg963xhwgpypa6nqq4g6104kqs0x7qbcinj5a3"; + sgr-iosevka-fixed-ss15 = "05bc3zzgmbh8mhpxskhvi3p8j38xxadvfkqck78j6f1034k9pcv3"; + sgr-iosevka-fixed-ss16 = "0whk1z3fzwagfa2vdp76iy2bfbp9jrgpq3vajmk49z4n1gh35rj2"; + sgr-iosevka-fixed-ss17 = "0085z35gagqgg410zqd9fa2vg9ixzgkz11n8rwjsmi5y5kg3rklq"; + sgr-iosevka-fixed-ss18 = "158c5xzp18ryfz8xhq2bvk6pplvsjcki4q3mc9v77gglmn23zcdh"; + sgr-iosevka-slab = "0i68g7wj4bbmilsaprbj7y69dbkg98nhd1zivc9x3pfka8pa53fd"; + sgr-iosevka-ss01 = "15yri67z1rbslv5b9aaf198ayrnifc31rivg67lgb6gm62zafx9b"; + sgr-iosevka-ss02 = "1d3wnc30yadawkbs388xb8mnzhjb1c16v2rh99ma6cf4sf3ag2mv"; + sgr-iosevka-ss03 = "0razg88g43m4vgdjixrsncfgzx0xf78p400gjcwlvyf93l2z5hqz"; + sgr-iosevka-ss04 = "163zb0vjb150xj86kyxhhlm6m9y3b58vdnxr5mlch6cc74d0hclb"; + sgr-iosevka-ss05 = "1nkpy5khlq7jjmf7pxxkyk0rpjfbzb5hyif0b96xybdf8f834q76"; + sgr-iosevka-ss06 = "0bs86i0ibs2jzgqhs0k9p3c5llwlzjfkkbw8vrk6qn4pdahammsl"; + sgr-iosevka-ss07 = "15cljy3npakxaphbhy97mh0x9817d8qdg5948gmdybz2q259x77n"; + sgr-iosevka-ss08 = "0m3yjwm7gybk943zmyhw4ppr7kjd1w43p23vf7ia2d0qf698iyz1"; + sgr-iosevka-ss09 = "0sf5pidrxc9w2c5wxgym7cw0n0j5yqdbfysj5a9n64cglbwap6fz"; + sgr-iosevka-ss10 = "0775lxx3rk0sfvki042mwgixpk8xxsz4wr3a7whs7wym8b0pzhlw"; + sgr-iosevka-ss11 = "1kgzmb3qzjw6jhw02w13i2qsg2vva2hij79jbp01idqhygzbm82j"; + sgr-iosevka-ss12 = "1as3iww2rzs9c5a40cm8m30j933na5ijch72hfaf84sn6nhmvvhz"; + sgr-iosevka-ss13 = "0c083nk1c5hq0h8miv941j9vxk9x637r41mgizrlvjlpirr2l0w3"; + sgr-iosevka-ss14 = "19i10anm517j1gh1dq85hsa3yaanjfbqgczj5iqs8a8ygzf4fc2c"; + sgr-iosevka-ss15 = "0vrsc9dsa5fmr62xc9bax3sks72m2p9ph4hd98rajl502j1dlh3p"; + sgr-iosevka-ss16 = "0fajhxjjqigmg52n7w6bv3b4kymx6ycgjw256gfqkakwadvgcxbz"; + sgr-iosevka-ss17 = "178n0wr2jck2ms7cbmnxhw4favcljwdc8qw6fl68cid3hbnm7p8k"; + sgr-iosevka-ss18 = "0i80ns3mk7d7ac18l3lf5nbbiyb8rw12d1gjwd18nq5sqvqrypj3"; + sgr-iosevka-term = "02pyq8dq4hppbs0lqk1rf045bpvb6ylcygw70yqskvh250djid1i"; + sgr-iosevka-term-curly = "1g7adk1s00hkn4jimcsyj5zs2yvc7gd6xzhs7w7lzyqpvpfjl4k6"; + sgr-iosevka-term-curly-slab = "0kpasgyl08rinwjkahxja6fxzzcngb97n4f40619pbj0n6m8f4my"; + sgr-iosevka-term-slab = "0p3skdrkg5wj724p8lsfzrrhlwi3fzaih34wvwrfnid23x0w2wn2"; + sgr-iosevka-term-ss01 = "18qgpb9k3whgh0n6iacwsp017i4nj52hv4js9r5a8ck1i47nmrzr"; + sgr-iosevka-term-ss02 = "04wyg5jmbprqn50c2g1k69bqvmvaj1iljdjjcyd5431ph5rr5qq8"; + sgr-iosevka-term-ss03 = "0i3j4p4hswkyz64m1x8ffs20dh1lszmcs2gq4xvgrbfdzqm68mbx"; + sgr-iosevka-term-ss04 = "1bsxg3psg33whzhn79i4nnpmyld57xvy5ic63vykyl1vrik5rhwd"; + sgr-iosevka-term-ss05 = "006i3w44qxw3wdcmshx8g7mgaxv50lpvad2jyfskkzvm1n66dbhn"; + sgr-iosevka-term-ss06 = "067p5a95pj5rgv717zq3n25g9zlsx20xc28i2nn0f4ifqn3x3g7a"; + sgr-iosevka-term-ss07 = "0vj4dq8igp6f81rmdgql194xk57dh453z5baqzg2mg9f4an2jsb6"; + sgr-iosevka-term-ss08 = "150l621swy7y4v19g2kmzj3033q0y626pnb530mw6ng2vnyy0qb5"; + sgr-iosevka-term-ss09 = "1bycnq1x7fmqpxg88ks0hsyyi5nqcyywc9vkfxmsasf2qqgicisn"; + sgr-iosevka-term-ss10 = "1gkc5zvkk9rwrn11vcb2gz2vjz8rnr9z066ql47p8plhxkxh49pn"; + sgr-iosevka-term-ss11 = "0sslhjbdzg3x5i58ivmym80v4klqxh3mis7adc9gjg0qgi8z5p37"; + sgr-iosevka-term-ss12 = "1a8bisfnajmiidmkyin4kbrp6jfwrwvzkjam1g1657hp6y74qb90"; + sgr-iosevka-term-ss13 = "0vih5lcyr1diw3iifn11pjjj9j7xyy6c7ccbswfsn9c4fzb0jih5"; + sgr-iosevka-term-ss14 = "1z643z83hyd0fya58sr897fhz38niils9ln8086chxhnlmpjlgpy"; + sgr-iosevka-term-ss15 = "10l4531xf2mygfbbyyp3krf9z0psv0133zvv7iqjb4y46pmj2gzf"; + sgr-iosevka-term-ss16 = "1dbddz9r8babvskax87pzyffl69rld9a6p4y655imr32y10bgg3n"; + sgr-iosevka-term-ss17 = "1brqlxpgplnmhi56km8019ssshv1djy8k2hm80d9hrdfadzzp6cw"; + sgr-iosevka-term-ss18 = "1cnfabclw4w0f4vv4w2rx6prhcrm8cz6jsksnp37apa26z5bh2py"; } diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 9b4a7bf6b5f..8077e29316a 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "2.9"; + version = "2.10"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - hash = "sha256-eCu7AgL4bzstu8vsqBJImRZm1qMVnnycuOShY5fB+C4="; + hash = "sha256-3hpg9a5HU7mSSlMOWvmB/p0Mlyla5PDiS0J9iYJLr6Q="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index e1f0009ba47..93888dd1179 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -72,13 +72,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.8.3"; + version = "5.8.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-PvU5lcoIDguWiLdI+uIiJHqS1ae436Xc7TfRVytR02k="; + hash = "sha256-34kOSDIU56cSZ4j0FadVfr9HLQytnK4ys88DFF7LTiM="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index fa282f0937a..775ab979ad8 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "5.8.1"; + version = "5.8.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-tRLUdwEptLNngVq+qOPilGQipVXNeDlzohgu3VlVciI="; + hash = "sha256-7AXm4ZTpI/4Xa2lwDmEvomNdwmgVoXSKqojpFZMuoVQ="; }; buildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index c4cd8d9db02..6692aac628f 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "5.8.0"; + version = "5.8.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Y1veBgWTCs7HRBuMwN+eHu4oygGYIanaQigMGVfkSuI="; + hash = "sha256-d7h9OJ39HVQNCHNr13M1ybDFoU3Xnd1PEczGLHZU/lU="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix index b889d7ff6a7..8f75fb2b614 100644 --- a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix +++ b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix @@ -7,14 +7,14 @@ stdenvNoCC.mkDerivation rec { pname = "folder-color-switcher"; - version = "1.5.8"; + version = "1.5.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # They don't really do tags, this is just a named commit. - rev = "f167627cffaf8b34e27b0515153b669b980fd62e"; - sha256 = "sha256-u8Lv0OTxKgjIp1q5WR0NXULhnwFfEDYGRlBpFMVHCBY="; + rev = "b735ed90b798eda541885735368930d045430e6e"; + sha256 = "sha256-acbBghi3LWpGH1dBF8icuTGgliA+NM+pE8YDN3WxOic="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-l-theme/default.nix b/pkgs/desktops/cinnamon/mint-l-theme/default.nix index 933745d5055..cc86b1af418 100644 --- a/pkgs/desktops/cinnamon/mint-l-theme/default.nix +++ b/pkgs/desktops/cinnamon/mint-l-theme/default.nix @@ -8,13 +8,14 @@ stdenvNoCC.mkDerivation rec { pname = "mint-l-theme"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - rev = version; - hash = "sha256-uVWqsGdwFj4zLP5CqBCci+qbX9l+/esvoFWlToJR8lE="; + # They don't really do tags, this is just a named commit. + rev = "078219f4f947245b3b7bf271c7311f67bf744bfb"; + hash = "sha256-GK1bwKeyYTXZUNnOdOnqu2C0ZwJHheRVRYL2SLwOnd0="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index 612df33508d..18ffacded67 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-themes"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Tr9MtEsd5+8YGsJvBF+i39dBL6/ufC3UVhgi8pP04Zs="; + hash = "sha256-l/ePlvdrHUhRz/KBaBgUSA9KF/pufqeCgSAFRR03IKE="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 20a350cb525..d3046830f01 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { pname = "muffin"; - version = "5.8.0"; + version = "5.8.1"; outputs = [ "out" "dev" "man" ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-2pF6mKSSW4S0mfb4iBfZKBIVXKzrVyPeftcVrWSWzhc="; + hash = "sha256-9YE+pHXJb21CcAflL9swNyhQY3ZCkLlZbnmUwTNdyfA="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 13963f386df..0b4e3be1a32 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.8.3"; + version = "5.8.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-/GwtTklOkhCkbBMQLl4dKUnlZwN6FX2kqxN7cJVaVwE="; + sha256 = "sha256-WjgQXQe8iCzkc4pmeTIx6mSlsg88xy3FTPMokJWo3fg="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index 0471a177a56..10e6c4e96bf 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "pix"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-sKmdJOuT4Ioy5DmWN9ly+9bqSn4frcVPD5qMTKtxtiQ="; + sha256 = "sha256-iNUhcHG4nCZ4WNELodyLdztzfNg9g+F0eQrZHXS6Zj0="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index b56c5a037e0..d6bf6c1faaa 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "3.8.1"; + version = "3.8.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-ZmaY9FlDIJNQ9jYkUJDnKAgwn5wlQY89eWx3/RJZA7E="; + sha256 = "sha256-2zqlfoN4L+V237cQ3PVh49YaZfNKGiLqh2JIiGJE340="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/zig/0.10.nix b/pkgs/development/compilers/zig/0.10.nix index a6e253adde6..784cae916e3 100644 --- a/pkgs/development/compilers/zig/0.10.nix +++ b/pkgs/development/compilers/zig/0.10.nix @@ -8,18 +8,19 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zig"; version = "0.10.1"; - outputs = [ "out" "doc" ]; src = fetchFromGitHub { owner = "ziglang"; - repo = pname; - rev = version; + repo = "zig"; + rev = finalAttrs.version; hash = "sha256-69QIkkKzApOGfrBdgtmxFMDytRkSh+0YiaJQPbXsBeo="; }; + outputs = [ "out" "doc" ]; + nativeBuildInputs = [ cmake llvmPackages.llvm.dev @@ -41,14 +42,11 @@ stdenv.mkDerivation rec { ./zig_14559.patch ]; - preBuild = '' - export HOME=$TMPDIR; - ''; - + # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't + # work in Nix's sandbox. Use env from our coreutils instead. postPatch = '' - # Zig's build looks at /usr/bin/env to find dynamic linking info. This - # doesn't work in Nix' sandbox. Use env from our coreutils instead. - substituteInPlace lib/std/zig/system/NativeTargetInfo.zig --replace "/usr/bin/env" "${coreutils}/bin/env" + substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \ + --replace "/usr/bin/env" "${coreutils}/bin/env" ''; cmakeFlags = [ @@ -62,27 +60,34 @@ stdenv.mkDerivation rec { "-DZIG_TARGET_MCPU=baseline" ]; + env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache"; + postBuild = '' ./zig2 build-exe ../doc/docgen.zig ./docgen ./zig2 ../doc/langref.html.in ./langref.html ''; - doCheck = true; - postInstall = '' - install -Dm644 -t $doc/share/doc/$pname-$version/html ./langref.html + install -Dm644 -t $doc/share/doc/zig-${finalAttrs.version}/html ./langref.html ''; + doInstallCheck = true; + installCheckPhase = '' - $out/bin/zig test --cache-dir "$TMPDIR" -I $src/test $src/test/behavior.zig + runHook preInstallCheck + + $out/bin/zig test --cache-dir "$TMPDIR/cache-dir" -I $src/test $src/test/behavior.zig + + runHook postInstallCheck ''; - meta = with lib; { + meta = { homepage = "https://ziglang.org/"; description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; - license = licenses.mit; - maintainers = with maintainers; [ aiotter andrewrk AndersonTorres ]; - platforms = platforms.unix; + changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aiotter andrewrk AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/compilers/zig/0.9.1.nix b/pkgs/development/compilers/zig/0.9.1.nix index 637186f686e..908d9a49cd6 100644 --- a/pkgs/development/compilers/zig/0.9.1.nix +++ b/pkgs/development/compilers/zig/0.9.1.nix @@ -7,22 +7,14 @@ , zlib }: -let - zig_0_10_0 = fetchFromGitHub { - owner = "ziglang"; - repo = "zig"; - rev = "0.10.0"; - hash = "sha256-DNs937N7PLQimuM2anya4npYXcj6cyH+dRS7AiOX7tw="; - }; -in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zig"; version = "0.9.1"; src = fetchFromGitHub { owner = "ziglang"; - repo = pname; - rev = version; + repo = "zig"; + rev = finalAttrs.version; hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k="; }; @@ -34,7 +26,14 @@ stdenv.mkDerivation rec { ]; # TODO: remove on next upgrade - prePatch = '' + prePatch = let + zig_0_10_0 = fetchFromGitHub { + owner = "ziglang"; + repo = "zig"; + rev = "0.10.0"; + hash = "sha256-DNs937N7PLQimuM2anya4npYXcj6cyH+dRS7AiOX7tw="; + }; + in '' cp -R ${zig_0_10_0}/lib/libc/include/any-macos.13-any lib/libc/include/any-macos.13-any cp -R ${zig_0_10_0}/lib/libc/include/aarch64-macos.13-none lib/libc/include/aarch64-macos.13-gnu cp -R ${zig_0_10_0}/lib/libc/include/x86_64-macos.13-none lib/libc/include/x86_64-macos.13-gnu @@ -68,18 +67,20 @@ stdenv.mkDerivation rec { ]; doCheck = true; + checkPhase = '' runHook preCheck ./zig test --cache-dir "$TMPDIR" -I $src/test $src/test/behavior.zig runHook postCheck ''; - meta = with lib; { + meta = { homepage = "https://ziglang.org/"; description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; - license = licenses.mit; - maintainers = with maintainers; [ aiotter andrewrk AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.mit; + changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html"; + maintainers = with lib.maintainers; [ aiotter andrewrk AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index a79df7eba6c..1c04472e90d 100644 --- a/pkgs/development/interpreters/luau/default.nix +++ b/pkgs/development/interpreters/luau/default.nix @@ -1,18 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages }: stdenv.mkDerivation rec { pname = "luau"; - version = "0.572"; + version = "0.583"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - hash = "sha256-7pckVsxzEdy0YykyvaouNWmnETEi86Cs7kCxaoU5lHs="; + hash = "sha256-uyD3j5Xf5pGoqler1oi2IHuvt4xv6rFjQHJpmods4Qc="; }; nativeBuildInputs = [ cmake ]; + buildInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.libunwind ]; + installPhase = '' runHook preInstall @@ -34,8 +36,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://luau-lang.org/"; description = "A fast, small, safe, gradually typed embeddable scripting language derived from Lua"; + homepage = "https://luau-lang.org/"; + changelog = "https://github.com/Roblox/luau/releases/tag/${version}"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 001a1ee7eac..45a87690e19 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.23.0"; + version = "5.24.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gZF+dsj+KYrFklnJHT04XSGLdlEdslFmxeStz6jVl24="; + sha256 = "sha256-krskfuoCRxYcAIDqrae4+yEABXXZ9Nv0BjBVwSMjC7g="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index deb895da7d9..a2484ce8307 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "hsqldb"; - version = "2.7.1"; + version = "2.7.2"; underscoreMajMin = lib.replaceStrings ["."] ["_"] (lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; - sha256 = "sha256-d0FruJXNnwme1gPHWcIXpD2LO0fL8CzZOn8H14Quo50="; + sha256 = "sha256-/7NZy+ZroxeTF7av22LNJ0dlMzvTAWfOMypLLYWXWBI="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/libraries/librclone/default.nix b/pkgs/development/libraries/librclone/default.nix index 3b8bf83364c..3c6a1f407f6 100644 --- a/pkgs/development/libraries/librclone/default.nix +++ b/pkgs/development/libraries/librclone/default.nix @@ -8,7 +8,7 @@ let ext = stdenv.hostPlatform.extensions.sharedLibrary; in buildGoModule rec { pname = "librclone"; - inherit (rclone) version src vendorSha256; + inherit (rclone) version src patches vendorSha256; buildPhase = '' runHook preBuild diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index d63227ef9fc..9b866a26e69 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.12.2"; + version = "6.13.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-YYuTDUBTNKLmieb/pDljiN0T8NdaOb2aRmwkD85ZF38="; + hash = "sha256-gfGVVjtzpBGrPrp2k3fOIh54EAMSicyikF1CtaO74y8="; }; buildInputs = [ qtbase cpp-utilities ]; diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix index ce25bd9519a..bb1569b3a25 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix @@ -8,20 +8,19 @@ , cinnamon , glib , gsettings-desktop-schemas -, gtk3 , mate , xdg-desktop-portal }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-xapp"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xdg-desktop-portal-xapp"; rev = version; - hash = "sha256-0qZUSo3m63kSFYbfn8GUU8JLdgBimlqfEWWrsK/k+Aw="; + hash = "sha256-sPpRDoQuzyjqB+kwz0U2WFm/Byx7SueM3aCtpgy38JM="; }; nativeBuildInputs = [ @@ -35,7 +34,6 @@ stdenv.mkDerivation rec { cinnamon.cinnamon-desktop # org.cinnamon.desktop.background glib gsettings-desktop-schemas # org.gnome.system.location - gtk3 mate.mate-desktop # org.mate.background xdg-desktop-portal ]; diff --git a/pkgs/development/libraries/yas/default.nix b/pkgs/development/libraries/yas/default.nix new file mode 100644 index 00000000000..137693401eb --- /dev/null +++ b/pkgs/development/libraries/yas/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "yas"; + version = "7.1.0"; + + src = fetchFromGitHub { + owner = "niXman"; + repo = "yas"; + rev = version; + hash = "sha256-2+CpftWOEnntYBCc1IoR5eySbmhrMVunpUTZRdQ5I+A="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/include/yas + cp -r include/yas/* $out/include/yas + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/niXman/yas"; + description = "Yet Another Serialization"; + license = licenses.boost; + maintainers = with maintainers; [ ee2500 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/canals/default.nix b/pkgs/development/python-modules/canals/default.nix new file mode 100644 index 00000000000..6832a362613 --- /dev/null +++ b/pkgs/development/python-modules/canals/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildPythonPackage +, pythonOlder +, pythonAtLeast +, fetchFromGitHub +# native build inputs +, hatchling +# build input +, networkx +# check inputs +, pytestCheckHook +# optional dependencies +, pygraphviz +, requests +, mkdocs-material +, mkdocs-mermaid2-plugin +, mkdocstrings +}: +let + pname = "canals"; + version = "0.2.2"; + optional-dependencies = { + graphviz = [ pygraphviz ]; + mermaid = [ requests ]; + docs = [ mkdocs-material mkdocs-mermaid2-plugin mkdocstrings ]; + }; +in +buildPythonPackage { + inherit version pname; + format = "pyproject"; + + # Pypi source package doesn't contain tests + src = fetchFromGitHub { + owner = "deepset-ai"; + repo = pname; + rev = "v${version}"; + hash = "sha256-dF0bkY4DFJIovaseNiOLgF8lmha+njTTTzr2/4LzZEc="; + }; + + disabled = pythonOlder "3.8"; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + networkx + ]; + + passthru = { inherit optional-dependencies; }; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ optional-dependencies.mermaid; + + disabledTestPaths = [ + # requires internet connection to mermaid.ink + "test/pipelines/integration" + ]; + + pythonImportsCheck = [ "canals" ]; + + meta = with lib; { + description = "A component orchestration engine"; + homepage = "https://github.com/deepset-ai/canals"; + changelog = "https://github.com/deepset-ai/canals/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/django-rosetta/default.nix b/pkgs/development/python-modules/django-rosetta/default.nix index 7279e34dff7..d9337081ba3 100644 --- a/pkgs/development/python-modules/django-rosetta/default.nix +++ b/pkgs/development/python-modules/django-rosetta/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-rosetta"; - version = "0.9.8"; + version = "0.9.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mbi"; repo = "django-rosetta"; rev = "refs/tags/v${version}"; - hash = "sha256-3AXwRxNWVkqW65xdqUwjHM1W5qhHXTjapqaM0Wmsebw="; + hash = "sha256-OuKgqGYBlzQNKKAJYFhNi+LnONB/mxINMj4VBAVWjqI="; }; propagatedBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Rosetta is a Django application that facilitates the translation process of your Django projects"; homepage = "https://github.com/mbi/django-rosetta"; - changelog = "https://github.com/jazzband/django-rosetta/releases/tag/v${version}"; + changelog = "https://github.com/mbi/django-rosetta/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ derdennisop ]; }; diff --git a/pkgs/development/python-modules/effdet/default.nix b/pkgs/development/python-modules/effdet/default.nix new file mode 100644 index 00000000000..e6a7945ae0b --- /dev/null +++ b/pkgs/development/python-modules/effdet/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +# build inputs +, torch +, torchvision +, timm +, pycocotools +, omegaconf +}: +let + pname = "effdet"; + version = "0.4.1"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-rFWJ/TBKVlDCAZhrLvX44QwREJOnGxxJ+muIF3EIErU="; + }; + + propagatedBuildInputs = [ + torch + torchvision + timm + pycocotools + omegaconf + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "effdet" ]; + + meta = { + description = "A PyTorch implementation of EfficientDet"; + homepage = "https://pypi.org/project/effdet"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index bca7d3c71c2..05699dd07e3 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ikalchev"; repo = "HAP-python"; rev = "refs/tags/${version}"; - hash = "sha256-fAJB1gk8zTS/mW5KzWr3z26qctZc/EQlk//WM1Xwpl0="; + hash = "sha256-/UBJh1m+WscN9I85/kvlNQnowNybEDyGVuQk4HBDWLE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 8f07f7bf0be..8f7c58a3dfd 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -9,6 +9,7 @@ , pytest-remotedata , pytest-rerunfailures , pytest-timeout +, pythonOlder , pytz , requests , requests-mock @@ -18,12 +19,14 @@ buildPythonPackage rec { pname = "pvlib"; - version = "0.10.0"; + version = "0.10.1"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi{ inherit pname version; - hash = "sha256-K/f6tjBznXYJz+Y5tVS1Bj+DKcPtCPlwiKe/YTEsGSI="; + hash = "sha256-H3wiNCmnZ6+GjXMhDbeOL98Yy7V6s2oOFAKWJCb8XCk="; }; nativeBuildInputs = [ @@ -48,9 +51,14 @@ buildPythonPackage rec { requests-mock ]; + pythonImportsCheck = [ + "pvlib" + ]; + meta = with lib; { homepage = "https://pvlib-python.readthedocs.io"; description = "Simulate the performance of photovoltaic energy systems"; + changelog = "https://pvlib-python.readthedocs.io/en/v${version}/whatsnew.html"; license = licenses.bsd3; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 4c43febd19d..72d5e403551 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.1.0"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-MobeeelKkU5KFIFP/+Ny0ktzTnhKzX+fpzTuODrfjG0="; + hash = "sha256-UCWNub0FErdmF3kGSIJlpIcKdPZdPzJ5y8yx9ZPBUlw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 3e7e399256e..3e005d86b47 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.13.3"; + version = "2.13.5"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-CYc/tFjDFXFlSY4/ykM7OR8HsUbYQUHL5IfGYw7to4k="; + sha256 = "sha256-/carrJ87XvnD5Pd+MJAqNdXxA5vyJl0mX1hEbykhSUk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/capnproto-java/default.nix b/pkgs/development/tools/capnproto-java/default.nix index 95b78b724eb..cbda8c2cc97 100644 --- a/pkgs/development/tools/capnproto-java/default.nix +++ b/pkgs/development/tools/capnproto-java/default.nix @@ -2,23 +2,15 @@ stdenv.mkDerivation rec { pname = "capnproto-java"; - version = "0.1.5"; + version = "0.1.15"; src = fetchFromGitHub { owner = "capnproto"; repo = pname; rev = "v${version}"; - hash = "sha256:1512x70xa6mlg9dmr84r8xbf0jzysjal51ivhhh2ppl97yiqjgls"; + hash = "sha256:IcmzI1G0mXOlpzmiyeLD7o1p/eOeVpwkiGsgy5OIjxw="; }; - patches = [ - # Add make install rule - (fetchpatch { - url = "https://github.com/capnproto/capnproto-java/commit/e96448d3f5737db25e55cd268652712b69db5cc0.diff"; - sha256 = "0f3vyap1zsxy675900pzg5ngh7bf9icllm1w04q64g8i91sdzljl"; - }) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ capnproto ]; @@ -30,6 +22,6 @@ stdenv.mkDerivation rec { longDescription = "Only includes compiler plugin, the Java runtime/library that the generated code will link to must be built separately with Maven."; homepage = "https://dwrensha.github.io/capnproto-java/index.html"; license = licenses.mit; - maintainers = with maintainers; [ bhipple ]; + maintainers = with maintainers; [ bhipple solson ]; }; } diff --git a/pkgs/development/tools/impl/default.nix b/pkgs/development/tools/impl/default.nix index e5792d3137d..bec08cb7e90 100644 --- a/pkgs/development/tools/impl/default.nix +++ b/pkgs/development/tools/impl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "impl"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "josharian"; repo = "impl"; rev = "v${version}"; - sha256 = "sha256-OztQR1NusP7/FTm5kmuSSi1AC47DJFki7vVlPQIl6+8="; + hash = "sha256-BqRoLh0MpNQgY9OHHRBbegWGsq3Y4wOqg94rWvex76I="; }; - vendorSha256 = "sha256-+5+CM5iGV54zRa7rJoQDBWrO98icNxlAv8JwATynanY="; + vendorHash = "sha256-+5+CM5iGV54zRa7rJoQDBWrO98icNxlAv8JwATynanY="; preCheck = '' export GOROOT="$(go env GOROOT)" diff --git a/pkgs/development/tools/kaf/default.nix b/pkgs/development/tools/kaf/default.nix index 5c0f2116b84..5b9a1bfc7d5 100644 --- a/pkgs/development/tools/kaf/default.nix +++ b/pkgs/development/tools/kaf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kaf"; - version = "0.2.3"; + version = "0.2.6"; src = fetchFromGitHub { owner = "birdayz"; repo = "kaf"; rev = "v${version}"; - sha256 = "sha256-5wSxaryaQ8jXwpzSltMmFRVrvaA9JMSrh8VBCnquLXE="; + hash = "sha256-BH956k2FU855cKT+ftFOtRR2IjQ4sViiGy0tvrMWpEQ="; }; - vendorSha256 = "sha256-Jpv02h+EeRhVdi/raStTEfHitz0A71dHpWdF/zcVJVU="; + vendorHash = "sha256-Y8jma4M+7ndJARfLmGCUmkIL+Pkey599dRO7M4iXU2Y="; # Many tests require a running Kafka instance doCheck = false; diff --git a/pkgs/development/tools/language-servers/pylyzer/default.nix b/pkgs/development/tools/language-servers/pylyzer/default.nix index 7e99c798727..61e48b5f1f9 100644 --- a/pkgs/development/tools/language-servers/pylyzer/default.nix +++ b/pkgs/development/tools/language-servers/pylyzer/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.34"; + version = "0.0.37"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "v${version}"; - hash = "sha256-arrhKskf3McXx8er6AyUIT1ZM3Rzwo10qTswpF+1klw="; + hash = "sha256-MzcGWOJud8SA6cpTdhms+Hfi0sAqelOr7dgy/k1H+qw="; }; - cargoHash = "sha256-m9/cIdmDqoUCeZnP7YezgCB/i8UGTcCCWDD/Qwhzg9E="; + cargoHash = "sha256-Xl0YxBmhhFKBzxbO1GXIds3XdSS78/7Z1rOAmLgTYSw="; nativeBuildInputs = [ git diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index d434ac50e54..efc3ac76c84 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "17.5.2"; + version = "17.6.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WNB4NzOvabShVHivDs027y6QmU71GMrYJehCB9jPlA8="; + hash = "sha256-mWHoiFal9WdASMe/Q7EJBp1Z2xu7Wq0i06xyqmi8q24="; }; vendorHash = "sha256-fHwaCcN47+LkJYqRFSQgVddVuR1QfdFuSNDYFh1edM4="; @@ -26,7 +26,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.Version=${version}" + "-X github.com/jandedobbeleer/oh-my-posh/src/build.Version=${version}" + "-X github.com/jandedobbeleer/oh-my-posh/src/build.Date=1970-01-01T00:00:00Z" ]; tags = [ diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 58895997b89..a81cc6bddd9 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-ncUA3sN8rWIf4tb3RAuUJWkOlxMMj/FrtSXy0sPfwGM="; + hash = "sha256-IgTAUxA1Cfe0LaYKrKtbm1PELGic31XRdGMIoLDG6w0="; }; vendorHash = null; diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index 68e18dfe26d..c5c6ed01ecc 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "blobby-volley"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "mirror://sourceforge/blobby/Blobby%20Volley%202%20%28Linux%29/1.0/blobby2-linux-1.0.tar.gz"; - sha256 = "1qpmbdlyhfbrdsq4vkb6cb3b8mh27fpizb71q4a21ala56g08yms"; + url = "mirror://sourceforge/blobby/Blobby%20Volley%202%20%28Linux%29/1.1/blobby2-linux-1.1.tar.gz"; + sha256 = "sha256-1WJ59Fhb1opXjOci+nAx/F2w5TnBaRhxQuPKgmmLfvQ="; }; nativeBuildInputs = [ cmake pkg-config zip ]; diff --git a/pkgs/games/maptool/default.nix b/pkgs/games/maptool/default.nix index 5cba8c22470..eed8bac656b 100644 --- a/pkgs/games/maptool/default.nix +++ b/pkgs/games/maptool/default.nix @@ -12,11 +12,11 @@ }: let pname = "maptool"; - version = "1.13.1"; + version = "1.13.2"; repoBase = "https://github.com/RPTools/${pname}"; src = fetchurl { url = "${repoBase}/releases/download/${version}/MapTool-${version}.jar"; - hash = "sha256-EHisFvLaqi8VqIdygf0nxohKLL3c/yE5Y6jAcT0B2q0="; + hash = "sha256-14ULI1OAk0V4DqiL5IF7DK6pw0NRfmU+omrFP72PblA="; }; icon = fetchurl { diff --git a/pkgs/games/minesweep-rs/default.nix b/pkgs/games/minesweep-rs/default.nix index 6e248f7f82f..1adaa51b5c8 100644 --- a/pkgs/games/minesweep-rs/default.nix +++ b/pkgs/games/minesweep-rs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "minesweep-rs"; - version = "6.0.11"; + version = "6.0.13"; src = fetchFromGitHub { owner = "cpcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-jGg6GrPDPOWvIQiZ9UJbGHLaxTxSV7EvqIcEoGrfRZ0="; + hash = "sha256-vr6tfwTIDuMyyeWTPeH71ECf4PqI2+5s1Lb45Cavr+4="; }; - cargoHash = "sha256-IKf44wCCzXcasuimnAwnEhJGmag67rGxQE7+rBEUVOI="; + cargoHash = "sha256-KHmZ37wnz8Z2dz78tiovqhNIiPcb5WBzk9plPNM/gqU="; meta = with lib; { description = "Sweep some mines for fun, and probably not for profit"; diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index 8e86d7e380c..5ecef6e7f0a 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -6,6 +6,8 @@ , perl , jre , libpulseaudio +, makeDesktopItem +, copyDesktopItems }: let @@ -52,26 +54,52 @@ let outputHash = "sha256-i4k5tdo07E1NJwywroaGvRjZ+/xrDp6ra+GTYwTB7uk="; }; + desktopItem = makeDesktopItem { + name = "shattered-pixel-dungeon"; + desktopName = "Shattered Pixel Dungeon"; + comment = "An open-source traditional roguelike dungeon crawler"; + icon = "shattered-pixel-dungeon"; + exec = "shattered-pixel-dungeon"; + terminal = false; + categories = [ "Game" "AdventureGame" ]; + keywords = [ "roguelike" "dungeon" "crawler" ]; + }; + in stdenv.mkDerivation rec { inherit pname version src patches postPatch; - nativeBuildInputs = [ gradle perl makeWrapper ]; + nativeBuildInputs = [ gradle perl makeWrapper copyDesktopItems ]; + + desktopItems = [ desktopItem ]; buildPhase = '' + runHook preBuild + export GRADLE_USER_HOME=$(mktemp -d) # https://github.com/gradle/gradle/issues/4426 ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} # point to offline repo sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle gradle --offline --no-daemon desktop:release + + runHook postBuild ''; installPhase = '' + runHook preInstall + install -Dm644 desktop/build/libs/desktop-${version}.jar $out/share/shattered-pixel-dungeon.jar mkdir $out/bin makeWrapper ${jre}/bin/java $out/bin/shattered-pixel-dungeon \ --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib \ --add-flags "-jar $out/share/shattered-pixel-dungeon.jar" + + for s in 16 32 48 64 128 256; do + install -Dm644 desktop/src/main/assets/icons/icon_$s.png \ + $out/share/icons/hicolor/''${s}x$s/apps/shattered-pixel-dungeon.png + done + + runHook postInstall ''; passthru.tests = { diff --git a/pkgs/games/theforceengine/default.nix b/pkgs/games/theforceengine/default.nix index 08209ac28c5..023acc0e06d 100644 --- a/pkgs/games/theforceengine/default.nix +++ b/pkgs/games/theforceengine/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "theforceengine"; - version = "1.09.200"; + version = "1.09.300"; src = fetchFromGitHub { owner = "luciusDXL"; repo = "TheForceEngine"; rev = "v${version}"; - sha256 = "sha256-r3fNhiPl6fjrIbdLoNIyTETw3lpPZCQYlTA2QJgiDgw="; + sha256 = "sha256-nf5fhP68AgBESiJleeZOLXkAajS+JmHUqyj4vAt2wl4="; }; nativeBuildInputs = [ diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 785e889421f..60eb1189391 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -97,10 +97,17 @@ let enableParallelBuilding = true; installPhase = ('' - for size in 16x16 24x24 32x32 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512 1024x1024 scalable; do - install -Dm644 ../../misc/logos/xonotic_icon.svg \ - $out/share/icons/hicolor/$size/xonotic.svg + install -Dm644 ../../misc/logos/xonotic_icon.svg \ + $out/share/icons/hicolor/scalable/apps/xonotic.svg + pushd ../../misc/logos/icons_png + for img in *.png; do + size=''${img#xonotic_} + size=''${size%.png} + dimensions="''${size}x''${size}" + install -Dm644 $img \ + $out/share/icons/hicolor/$dimensions/apps/xonotic.png done + popd '' + lib.optionalString withDedicated '' install -Dm755 darkplaces-dedicated "$out/bin/xonotic-dedicated" '' + lib.optionalString withGLX '' diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix index d7a2e5d1f5f..23529f6b0a1 100644 --- a/pkgs/misc/sound-of-sorting/default.nix +++ b/pkgs/misc/sound-of-sorting/default.nix @@ -7,9 +7,6 @@ , darwin }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in stdenv.mkDerivation { pname = "sound-of-sorting"; version = "unstable-2022-10-12"; @@ -18,17 +15,24 @@ stdenv.mkDerivation { owner = "bingmann"; repo = "sound-of-sorting"; rev = "5cfcaf752593c8cbcf52555dd22745599a7d8b1b"; - sha256 = "sha256-cBrTvFoz6WZIsh5qPPiWxQ338Z0OfcIefiI8CZF6nn8="; + hash = "sha256-cBrTvFoz6WZIsh5qPPiWxQ338Z0OfcIefiI8CZF6nn8="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; - buildInputs = [ wxGTK32 SDL2 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ + wxGTK32 + SDL2 + ] + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa ; - meta = with lib; { + meta = { description = "Audibilization and Visualization of Sorting Algorithms"; homepage = "https://panthema.net/2013/sound-of-sorting/"; - license = with licenses; gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/os-specific/linux/plymouth/add-runtime-plugin-path.patch b/pkgs/os-specific/linux/plymouth/add-runtime-plugin-path.patch new file mode 100644 index 00000000000..e4bd095bfd8 --- /dev/null +++ b/pkgs/os-specific/linux/plymouth/add-runtime-plugin-path.patch @@ -0,0 +1,67 @@ +diff --git a/meson.build b/meson.build +index 650ad189..1e1ebe1d 100644 +--- a/meson.build ++++ b/meson.build +@@ -18,6 +18,11 @@ plymouth_time_dir = get_option('prefix') / get_option('localstatedir') / 'lib' / + + plymouth_runtime_dir = get_option('runstatedir') / 'plymouth' + plymouth_runtime_theme_path = plymouth_runtime_dir / 'themes/' ++if get_option('runtime-plugins') ++ plymouth_runtime_plugin_path = plymouth_runtime_dir / 'plugins/' ++else ++ plymouth_runtime_plugin_path = plymouth_plugin_path ++endif + + # Dependencies + cc = meson.get_compiler('c') +@@ -76,7 +81,7 @@ conf.set('PLY_ENABLE_TRACING', get_option('tracing')) + conf.set_quoted('PLYMOUTH_RUNTIME_DIR', plymouth_runtime_dir) + conf.set_quoted('PLYMOUTH_THEME_PATH', plymouth_theme_path) + conf.set_quoted('PLYMOUTH_RUNTIME_THEME_PATH', plymouth_runtime_theme_path) +-conf.set_quoted('PLYMOUTH_PLUGIN_PATH', plymouth_plugin_path) ++conf.set_quoted('PLYMOUTH_PLUGIN_PATH', plymouth_runtime_plugin_path) + conf.set_quoted('PLYMOUTH_POLICY_DIR', plymouth_policy_dir) + conf.set_quoted('PLYMOUTH_CONF_DIR', plymouth_conf_dir) + conf.set_quoted('PLYMOUTH_TIME_DIRECTORY', plymouth_time_dir) +diff --git a/meson_options.txt b/meson_options.txt +index 4f601bb0..61fccc12 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -28,6 +28,11 @@ option('runstatedir', + value: '/run', + description: 'runstatedir', + ) ++option('runtime-plugins', ++ type: 'boolean', ++ value: false, ++ description: 'Use runstatedir for loading theme plugins', ++) + option('boot-tty', + type: 'string', + value: '/dev/tty1', +diff --git a/src/libply-splash-core/meson.build b/src/libply-splash-core/meson.build +index 69636b13..02bd5cbd 100644 +--- a/src/libply-splash-core/meson.build ++++ b/src/libply-splash-core/meson.build +@@ -31,7 +31,7 @@ libply_splash_core_cflags = [ + '-DPLYMOUTH_BACKGROUND_COLOR=@0@'.format(get_option('background-color')), + '-DPLYMOUTH_BACKGROUND_START_COLOR=@0@'.format(get_option('background-start-color-stop')), + '-DPLYMOUTH_BACKGROUND_END_COLOR=@0@'.format(get_option('background-end-color-stop')), +- '-DPLYMOUTH_PLUGIN_PATH="@0@"'.format(plymouth_plugin_path), ++ '-DPLYMOUTH_PLUGIN_PATH="@0@"'.format(plymouth_runtime_plugin_path), + ] + + libply_splash_core = library('ply-splash-core', +diff --git a/src/libply-splash-graphics/meson.build b/src/libply-splash-graphics/meson.build +index 32fad963..02b8440b 100644 +--- a/src/libply-splash-graphics/meson.build ++++ b/src/libply-splash-graphics/meson.build +@@ -20,7 +20,7 @@ libply_splash_graphics_cflags = [ + '-DPLYMOUTH_BACKGROUND_COLOR=@0@'.format(get_option('background-color')), + '-DPLYMOUTH_BACKGROUND_START_COLOR=@0@'.format(get_option('background-start-color-stop')), + '-DPLYMOUTH_BACKGROUND_END_COLOR=@0@'.format(get_option('background-end-color-stop')), +- '-DPLYMOUTH_PLUGIN_PATH="@0@"'.format(plymouth_plugin_path), ++ '-DPLYMOUTH_PLUGIN_PATH="@0@"'.format(plymouth_runtime_plugin_path), + ] + + libply_splash_graphics = library('ply-splash-graphics', diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index 4e755a28db8..0365abba143 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -1,97 +1,115 @@ { lib , stdenv -, fetchpatch , fetchFromGitLab +, writeText +, meson , pkg-config -, autoreconfHook -, libxslt +, ninja , docbook-xsl-nons , gettext +, libxslt , gtk3 -, systemd -, pango -, cairo , libdrm +, libevdev +, libpng +, libxkbcommon +, pango +, systemd +, xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "plymouth"; - version = "unstable-2021-10-18"; + version = "unstable-2023-06-05"; - outputs = [ - "out" - "dev" - ]; + outputs = [ "out" "dev" ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "plymouth"; repo = "plymouth"; - rev = "18363cd887dbfe7e82a2f4cc1a49ef9513919142"; - sha256 = "sha256-+AP4ALOFdYFt/8MDXjMaHptkogCwK1iXKuza1zfMaws="; + rev = "a5eda165689864cc9a25ec14fd8c6da458598f42"; + hash = "sha256-TpMZZ0naC4D0Knmclc8JpmXPfnpM6q8YotIkNX+aRVo="; }; + patches = [ + # do not create unnecessary symlink to non-existent header-image.png + ./dont-create-broken-symlink.patch + # add support for loading plugins from /run to assist NixOS module + ./add-runtime-plugin-path.patch + ]; + + strictDeps = true; + nativeBuildInputs = [ - autoreconfHook + meson + pkg-config + ninja docbook-xsl-nons gettext libxslt - pkg-config ]; buildInputs = [ - cairo gtk3 libdrm + libevdev + libpng + libxkbcommon pango systemd + xorg.xkeyboardconfig ]; - postPatch = '' - sed -i \ - -e "s#plymouthplugindir=.*#plymouthplugindir=/etc/plymouth/plugins/#" \ - -e "s#plymouththemedir=.*#plymouththemedir=/etc/plymouth/themes#" \ - -e "s#plymouthpolicydir=.*#plymouthpolicydir=/etc/plymouth/#" \ - -e "s#plymouthconfdir=.*#plymouthconfdir=/etc/plymouth/#" \ - configure.ac - ''; - - configurePlatforms = [ "host" ]; - - configureFlags = [ - "--enable-documentation" - "--enable-drm" - "--enable-gtk" - "--enable-pango" - "--enable-systemd-integration" - "--enable-tracing" - "--localstatedir=/var" + mesonFlags = let + # https://gitlab.freedesktop.org/plymouth/plymouth/-/blob/a5eda165689864cc9a25ec14fd8c6da458598f42/meson.build#L47 + crossFile = writeText "cross-file.conf" '' + [binaries] + systemd-tty-ask-password-agent = '${lib.getBin systemd}/bin/systemd-tty-ask-password-agent' + ''; + in [ "--sysconfdir=/etc" - "--with-background-color=0x000000" - "--with-background-end-color-stop=0x000000" - "--with-background-start-color-stop=0x000000" - "--with-logo=/etc/plymouth/logo.png" - "--with-release-file=/etc/os-release" - "--with-runtimedir=/run" - "--with-systemdunitdir=${placeholder "out"}/etc/systemd/system" - "--without-rhgb-compat-link" - "--without-system-root-install" - "ac_cv_path_SYSTEMD_ASK_PASSWORD_AGENT=${lib.getBin systemd}/bin/systemd-tty-ask-password-agent" + "--localstatedir=/var" + "-Dlogo=/etc/plymouth/logo.png" + "-Dbackground-color=0x000000" + "-Dbackground-start-color-stop=0x000000" + "-Dbackground-end-color-stop=0x000000" + "-Drelease-file=/etc/os-release" + "-Dudev=enabled" + "-Drunstatedir=/run" + "-Druntime-plugins=true" + "--cross-file=${crossFile}" ]; - installFlags = [ - "localstatedir=\${TMPDIR}" - "plymouthd_confdir=${placeholder "out"}/etc/plymouth" - "plymouthd_defaultsdir=${placeholder "out"}/share/plymouth" - "sysconfdir=${placeholder "out"}/etc" - ]; + postPatch = '' + substituteInPlace meson.build \ + --replace "run_command(['scripts/generate-version.sh'], check: true).stdout().strip()" "'${finalAttrs.version}'" + + # prevent installing unused non-$out dirs to DESTDIR + sed -i '/^install_emptydir/d' src/meson.build + ''; postInstall = '' - # Makes a symlink to /usr/share/pixmaps/system-logo-white.png - # We'll handle it in the nixos module. - rm $out/share/plymouth/themes/spinfinity/header-image.png + # Move stuff from DESTDIR to proper location. + cp -a "$DESTDIR/etc" "$out" + rm -r "$DESTDIR/etc" + for o in $(getAllOutputNames); do + if [[ "$o" = "debug" ]]; then continue; fi + cp -a "$DESTDIR/''${!o}" "$(dirname "''${!o}")" + rm -r "$DESTDIR/''${!o}" + done + # Ensure the DESTDIR is removed. + rmdir "$DESTDIR/${builtins.storeDir}" "$DESTDIR/${builtins.dirOf builtins.storeDir}" "$DESTDIR" ''; + # HACK: We want to install configuration files to $out/etc + # but Plymouth should read them from /etc on a NixOS system. + # With autotools, it was possible to override Make variables + # at install time but Meson does not support this + # so we need to convince it to install all files to a temporary + # location using DESTDIR and then move it to proper one in postInstall. + env.DESTDIR = "${placeholder "out"}/dest"; + meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/Plymouth/"; description = "Boot splash and boot logger"; @@ -99,4 +117,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.goibhniu ] ++ teams.gnome.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/os-specific/linux/plymouth/dont-create-broken-symlink.patch b/pkgs/os-specific/linux/plymouth/dont-create-broken-symlink.patch new file mode 100644 index 00000000000..7accb7c9efc --- /dev/null +++ b/pkgs/os-specific/linux/plymouth/dont-create-broken-symlink.patch @@ -0,0 +1,13 @@ +diff --git a/themes/spinfinity/meson.build b/themes/spinfinity/meson.build +index f48e8e55..5a2050c8 100644 +--- a/themes/spinfinity/meson.build ++++ b/themes/spinfinity/meson.build +@@ -53,8 +53,3 @@ install_data( + 'throbber-33.png', + install_dir: plymouth_theme_path / 'spinfinity', + ) +- +-install_symlink('header-image.png', +- install_dir: plymouth_theme_path / 'spinfinity', +- pointing_to: plymouth_logo_file, +-) diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index f75e9465acc..29e24077584 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.3.12"; + version = "4.3.13"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - hash = "sha256-jF1tk/JeZ3RGHol+itwtkTF/cn5FHm/vhUgXJzi9J9E="; + hash = "sha256-SAyZ1Ob6swF6i1LFLpwyfMVSi/tOAfz6aiUNOVeJIa0="; }; passthru = { diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index 519369e28d1..8e3792e5b13 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "murex"; - version = "4.2.5110"; + version = "4.3.3200"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qUnOHnYEzkEQyAn1S2dWXWJIDs0UBtPXIufCzQAtZw8="; + sha256 = "sha256-W0P/WZ+GC0on7ZKjGNq6UQO9iAMIo7vODn9JltfK5XY="; }; vendorHash = "sha256-eQfffqNxt6es/3/H59FC5mLn1IU3oMpY/quzgNOgOaU="; diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 9bec2b61a6a..be1d69e3e2e 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, substituteAll, pkgs, bash }: -# To make use of this derivation, use -# `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";` let # match gitstatus version with given `gitstatus_version`: @@ -49,6 +47,10 @@ stdenv.mkDerivation rec { meta = { changelog = "https://github.com/romkatv/powerlevel10k/releases/tag/v${version}"; description = "A fast reimplementation of Powerlevel9k ZSH theme"; + longDescription = '' + To make use of this derivation, use + `programs.zsh.promptInit = "source ''${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";` + ''; homepage = "https://github.com/romkatv/powerlevel10k"; license = lib.licenses.mit; platforms = lib.platforms.unix; diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix index 27e3a648e2b..0c4a47f8ce2 100644 --- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix @@ -1,8 +1,5 @@ { lib, stdenv, fetchFromGitHub }: -# To make use of this derivation, use -# `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel9k}/share/zsh-powerlevel9k/powerlevel9k.zsh-theme";` - stdenv.mkDerivation { pname = "powerlevel9k"; version = "2017-11-10"; @@ -21,6 +18,10 @@ stdenv.mkDerivation { meta = { description = "A beautiful theme for zsh"; + longDescription = '' + To make use of this derivation, use + `programs.zsh.promptInit = "source ''${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";` + ''; homepage = "https://github.com/bhilburn/powerlevel9k"; license = lib.licenses.mit; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 3e66de48b4d..22da13f5d1e 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -105,6 +105,7 @@ rec { name = "darwin-portable-libSystem-hook"; substitutions = { libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib"; + targetPrefix = stdenv.cc.bintools.targetPrefix; }; } ./darwin/portable-libsystem.sh) ]; diff --git a/pkgs/stdenv/darwin/portable-libsystem.sh b/pkgs/stdenv/darwin/portable-libsystem.sh index f50ccc8d32e..7608c0a0de2 100644 --- a/pkgs/stdenv/darwin/portable-libsystem.sh +++ b/pkgs/stdenv/darwin/portable-libsystem.sh @@ -6,7 +6,7 @@ fixupOutputHooks+=('fixLibsystemRefs $prefix') fixLibsystemRefs() { if [ -d "$1/bin" ]; then - find "$1/bin" -exec \ - install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \; + find "$1/bin" -type f -exec \ + @targetPrefix@install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \; fi } diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index c689209be51..f8a867bcacc 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.11.9"; + version = "0.11.10"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-OS/yEr3/HQTPCfonQABvHW+c5wSzhi8JbrMbfwuyd/s="; + sha256 = "sha256-1jJDgjkay1IsWMWoRf6iRWFr7685uE9Kr9DCreH13CM="; }; - vendorHash = "sha256-j/ZsnvcGREmFpO7IJfPVmSFkKSIJW+bAMqAGNj8vopk="; + vendorHash = "sha256-rHUPtscmG28PyNWzoayThbRt+3t9ewBe8vsRqtVc1WM="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 045d6674262..96a37cfa47f 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2023.05.30"; + version = "2023.06.25"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-aiwObK/5UhvLMPMWNlO5GaYJH9z9RHTTrRQL1IGI7i4="; + hash = "sha256-Fn10QcwqKPerMh3OMJTMUQZ6nUMgBysXmxCbEOXSG0k="; }; meta = with lib; { diff --git a/pkgs/tools/graphics/vkbasalt/default.nix b/pkgs/tools/graphics/vkbasalt/default.nix index 4bfeed0bc12..937166ae9f4 100644 --- a/pkgs/tools/graphics/vkbasalt/default.nix +++ b/pkgs/tools/graphics/vkbasalt/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vkbasalt"; - version = "0.3.2.9"; + version = "0.3.2.10"; src = fetchFromGitHub { owner = "DadSchoorse"; repo = "vkBasalt"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-IVlZ6o+1EEEh547rFPN7z+W+EY7MrIM/yUh6+PPkNeI="; + hash = "sha256-GC6JKYnsfcUBg+CX6v7MyE4FeLmjadFwighaiyureDg="; }; nativeBuildInputs = [ glslang meson ninja pkg-config ]; diff --git a/pkgs/tools/misc/cf-terraforming/default.nix b/pkgs/tools/misc/cf-terraforming/default.nix index 7774d0513f5..05f8586a145 100644 --- a/pkgs/tools/misc/cf-terraforming/default.nix +++ b/pkgs/tools/misc/cf-terraforming/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cf-terraforming"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cf-terraforming"; rev = "v${version}"; - sha256 = "sha256-HCJYLU3eo1C06qp8sb2MsDoLrD0bDeu5WEeGCrOucn4="; + sha256 = "sha256-s2xsFJ+8ivkdG2F52iRdTbJDEw8ALmFDR7Ct6d84p+s="; }; - vendorHash = "sha256-HLKk64PcJUjKfY4pIwI2OXnjqFF1EkYlWOi0aWOVSbk="; + vendorHash = "sha256-pe5ieCstUe3ZHlJs83lzwNS2qAIhIGJG9E5P4Ri3E/s="; ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ]; # The test suite insists on downloading a binary release of Terraform from diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 465b42a8407..1a4c9b36fbb 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.34.2"; + version = "2.34.3"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-rq+TN9j/PX2h3lzK+WhcB3KBgvcTyXyU9VApelqfIJE="; + hash = "sha256-Cy2mRcx8UZp9+7O824sosQ8ld9ppl2YvCssvL16aBsA="; }; - vendorHash = "sha256-UyWrvReFUCQ091Mbk1iJE55rJkkmTyMX4yvb9ppszt8="; + vendorHash = "sha256-Z812v+UTaAi3tA2hWtZkQXrtlXhQzlawYtbQdX1HHN0="; doCheck = false; diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index adccb3a8da4..76f43acf138 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.80.0"; + version = "0.81.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - hash = "sha256-Etm4VbLnkxDxWZqi5T+QfqCAUG1cqJzcSCV346ZxgP8="; + hash = "sha256-yywmnJUTigDYeiAuK0f2511vh6sS4oD4hJLPozAlWz4="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorHash = "sha256-O4NnXJHAP54tejolwp/G9n4ogW5daOZxTQ2NKSCtefE="; + vendorHash = "sha256-BNIQ0pTHGgwWw1cy7au6hUeECC8oGsSkxaX5BUCRG9Y="; # upstream strongly recommends disabling CGO # additionally dependencies have had issues when GCO was enabled that weren't caught upstream diff --git a/pkgs/tools/misc/rustypaste-cli/default.nix b/pkgs/tools/misc/rustypaste-cli/default.nix index dc0c03fdc81..807db491a51 100644 --- a/pkgs/tools/misc/rustypaste-cli/default.nix +++ b/pkgs/tools/misc/rustypaste-cli/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste-cli"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "orhun"; repo = "rustypaste-cli"; rev = "v${version}"; - hash = "sha256-lMXd/wllk/67W3dJr/ps36s/p+tMCyu2HU9gWYubejw="; + hash = "sha256-wAaicErRqQcOlxjTpG7sL4Fx8mZgfqVPFoaHdTlHLew="; }; - cargoHash = "sha256-6ddjSP072+jYjPVcTZcQndM1pElUE30hU3M/sf5Lnsk="; + cargoHash = "sha256-lON5BpV85lnTyYy0TXERkfLd84cBhte0F6EwHTMON/A="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 9291d32972e..e903b064d02 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "steampipe"; - version = "0.20.7"; + version = "0.20.8"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-t9RNrbW7wR2WiUacf6/U4qtcR7ZvDZ+duRQ282ScRmU="; + sha256 = "sha256-neHcLO64Ik61P6R6rFL3kuKi9qRQ64f1xEqUrgUKeCg="; }; vendorHash = "sha256-VuUzo+afUazXH7jaR4Qm5Kfr6qiyHqdGLJWS3MX8oOA="; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 37b64143f9a..2b69064a141 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-Yc2vtdt+kXTQdXuOS83pODUjBvt8yP8rX1XCbdSKbPc="; + sha256 = "sha256-SFVS/NnV1fQarQRvEx/Ap+hJvvJaNJoEB1CvDG/FaAc="; }; buildInputs = [ openssl zlib libxcrypt ] diff --git a/pkgs/tools/networking/iperf3d/default.nix b/pkgs/tools/networking/iperf3d/default.nix new file mode 100644 index 00000000000..f92299adf2e --- /dev/null +++ b/pkgs/tools/networking/iperf3d/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, rustPlatform, makeWrapper, iperf3 }: + +rustPlatform.buildRustPackage rec { + pname = "iperf3d"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "wobcom"; + repo = pname; + rev = "v${version}"; + hash = "sha256-pMwGoBgFRVY+H51k+YCamzHgBoaJVwEVqY0CvMPvE0w="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/iperf3d --prefix PATH : ${iperf3}/bin + ''; + + cargoHash = "sha256-3mJBn70sSoDL9GNxgEZqA8S4GrY+DjnYY9Cc5Xe1GFQ="; + + meta = with lib; { + description = "A iperf3 client and server wrapper for dynamic server ports"; + homepage = "https://github.com/wobcom/iperf3d"; + license = licenses.mit; + maintainers = [ maintainers.netali ]; + }; +} diff --git a/pkgs/tools/networking/networkmanager/dmenu/default.nix b/pkgs/tools/networking/networkmanager/dmenu/default.nix index 741c7349433..7af0be41835 100644 --- a/pkgs/tools/networking/networkmanager/dmenu/default.nix +++ b/pkgs/tools/networking/networkmanager/dmenu/default.nix @@ -4,13 +4,13 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "networkmanager_dmenu"; - version = "2.1.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "firecat53"; repo = "networkmanager-dmenu"; rev = "v${version}"; - sha256 = "sha256-btwiKxmb1xDtPSTOIvpHJDQ5SY1gnBWlKnYOzzSLDEY="; + sha256 = "sha256-cJeDYk2BQv2ZWGC96I7lXFFYgseWj68ZfvE7ATW46U0="; }; buildInputs = [ glib python pygobject3 gobject-introspection networkmanager python3Packages.wrapPython ]; diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix index 5d132c7a842..928023e0b41 100644 --- a/pkgs/tools/package-management/poetry/default.nix +++ b/pkgs/tools/package-management/poetry/default.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchFromGitHub +, fetchPypi }: let @@ -9,37 +10,55 @@ let poetry = self.callPackage ./unwrapped.nix { }; # version overrides required by poetry and its plugins - platformdirs = super.platformdirs.overridePythonAttrs (old: rec { - version = "2.6.2"; + cachecontrol = super.cachecontrol.overridePythonAttrs (old: rec { + version = "0.12.14"; + format = "setuptools"; src = fetchFromGitHub { - owner = "platformdirs"; - repo = "platformdirs"; - rev = "refs/tags/${version}"; - hash = "sha256-yGpDAwn8Kt6vF2K2zbAs8+fowhYQmvsm/87WJofuhME="; + owner = "ionrock"; + repo = "cachecontrol"; + rev = "v${version}"; + hash = "sha256-BuBaKP7OAYoT+SPVhtE6l9U/KmN21OKTL6poV5a6+0c="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeCheckInputs = old.nativeCheckInputs ++ [ + self.lockfile + ]; }); poetry-core = super.poetry-core.overridePythonAttrs (old: rec { - version = "1.5.2"; + version = "1.6.1"; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-core"; rev = version; - hash = "sha256-GpZ0vMByHTu5kl7KrrFFK2aZMmkNO7xOEc8NI2H9k34="; + hash = "sha256-Gc22Y2T4uO39jiOqEUFeOfnVCbknuDjmzFPZgk2eY74="; }; + nativeCheckInputs = old.nativeCheckInputs ++ [ + self.tomli-w + ]; }); - }; + virtualenv = super.virtualenv.overridePythonAttrs (old: rec { + version = "20.23.1"; + src = fetchPypi { + inherit (old) pname; + inherit version; + hash = "sha256-j/GaOMECHHQhSO3E+By0PX+MaBbS7eKrcq9bhMdJreE="; + }; + nativeCheckInputs = old.nativeCheckInputs ++ [ + self.time-machine + ]; + }); + } // (plugins self); }; - plugins = with python.pkgs; { + plugins = ps: with ps; { poetry-audit-plugin = callPackage ./plugins/poetry-audit-plugin.nix { }; + poetry-plugin-export = callPackage ./plugins/poetry-plugin-export.nix { }; poetry-plugin-up = callPackage ./plugins/poetry-plugin-up.nix { }; }; # selector is a function mapping pythonPackages to a list of plugins # e.g. poetry.withPlugins (ps: with ps; [ poetry-plugin-up ]) withPlugins = selector: let - selected = selector plugins; + selected = selector (plugins python.pkgs); in python.pkgs.toPythonApplication (python.pkgs.poetry.overridePythonAttrs (old: { propagatedBuildInputs = old.propagatedBuildInputs ++ selected; @@ -52,8 +71,9 @@ let rm $out/nix-support/propagated-build-inputs ''; - passthru = rec { - inherit plugins withPlugins python; + passthru = { + plugins = plugins python.pkgs; + inherit withPlugins python; }; })); in withPlugins (ps: [ ]) diff --git a/pkgs/development/python-modules/poetry-plugin-export/default.nix b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix index d712dacff7c..24433f3601e 100644 --- a/pkgs/development/python-modules/poetry-plugin-export/default.nix +++ b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "poetry-plugin-export"; - version = "1.3.1"; + version = "1.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-zA5YHZ3/iVoNf2AKqkrKVDYJIoJh+FMwuoskWHutG5I="; + hash = "sha256-okI91Z9u5w7IHpPb9jL4Hb8+MkYJEF2qm0mqqCdyKbk="; }; postPatch = '' diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix index 71b7b96c486..ab00788facc 100644 --- a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix +++ b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , buildPythonPackage , poetry-core , pytestCheckHook @@ -19,6 +20,14 @@ buildPythonPackage rec { hash = "sha256-QDfXgLkwh5rfyNZv0S7+cq6ubldXsbuCiTr6VYx8ZQs="; }; + patches = [ + # https://github.com/MousaZeidBaker/poetry-plugin-up/pull/24 + (fetchpatch { + url = "https://github.com/MousaZeidBaker/poetry-plugin-up/commit/31d78c547896efd27c2be0956a982638f32b07f8.patch"; + hash = "sha256-CkZgX/ES+VkfxBofxWeparXNjsdP4qcQ1I32zaBBmWo="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/tools/package-management/poetry/unwrapped.nix index 550a8335e26..839b1882aa0 100644 --- a/pkgs/tools/package-management/poetry/unwrapped.nix +++ b/pkgs/tools/package-management/poetry/unwrapped.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.4.2"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AiRQFZA5+M1niTzj1RO2lx0QFOMmSzpQo1gzauyTblg="; + hash = "sha256-1zqfGzSI5RDACSNcz0tLA4VKMFwE5uD/YqOkgpzg2nQ="; }; nativeBuildInputs = [ @@ -123,6 +123,7 @@ buildPythonPackage rec { ''; disabledTests = [ + "test_installer_with_pypi_repository" # touches network "git" "solver" diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 840ca066f65..56b5884b047 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.63.0"; + version = "3.63.1"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-7M/ZdeaiOWJEXEhZ0Sj8oxvMgo0mgSNmpUBWm9qxafA="; + sha256 = "sha256-ESh35VSxFeg8d9cu4FJZi4m1/3cb2iRkngUDrInljV4="; }; vendorHash = "sha256-yuGjaUHfXCJnMvxfaSwbVAApflwfsvX2W7iEZdruMDE="; diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix index 3adb802aad4..dd4b7b2ca97 100644 --- a/pkgs/tools/text/a2ps/default.nix +++ b/pkgs/tools/text/a2ps/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "a2ps"; - version = "4.15.4"; + version = "4.15.5"; src = fetchurl { url = "mirror://gnu/a2ps/a2ps-${version}.tar.gz"; - hash = "sha256-SgY/hLqJ2GvhSmcEyjX9EwCDtXLxN2tDmht5tnsgbdc="; + hash = "sha256-gbsbQQTnwmOXYkUe3JeG2vPf6ziErfx9xqydII8w2n8="; }; postPatch = '' diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile b/pkgs/tools/typesetting/asciidoctor/Gemfile index 32e18b53aa6..a485cb2e12c 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile @@ -4,3 +4,4 @@ gem 'asciidoctor-pdf' gem 'coderay' gem 'pygments.rb' gem 'rouge' +gem 'tilt' diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index e7b6b5c4644..724ed31dd94 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -2,11 +2,11 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - addressable (2.8.1) + addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) afm (0.2.2) - asciidoctor (2.0.18) - asciidoctor-pdf (2.3.2) + asciidoctor (2.0.20) + asciidoctor-pdf (2.3.9) asciidoctor (~> 2.0) concurrent-ruby (~> 1.1) matrix (~> 0.4) @@ -17,13 +17,13 @@ GEM prawn-templates (~> 0.1.0) treetop (~> 1.6.0) coderay (1.1.3) - concurrent-ruby (1.1.10) - css_parser (1.12.0) + concurrent-ruby (1.2.2) + css_parser (1.14.0) addressable hashery (2.1.2) matrix (0.4.2) pdf-core (0.9.0) - pdf-reader (2.10.0) + pdf-reader (2.11.0) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) @@ -44,12 +44,13 @@ GEM prawn-templates (0.1.2) pdf-reader (~> 2.0) prawn (~> 2.2) - public_suffix (5.0.0) - pygments.rb (2.3.0) + public_suffix (5.0.1) + pygments.rb (2.4.0) rexml (3.2.5) - rouge (4.0.0) + rouge (4.1.2) ruby-rc4 (0.1.5) - treetop (1.6.11) + tilt (2.2.0) + treetop (1.6.12) polyglot (~> 0.3) ttfunk (1.7.0) @@ -62,6 +63,7 @@ DEPENDENCIES coderay pygments.rb rouge + tilt BUNDLED WITH - 2.3.22 + 2.4.14 diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix index 9c0f96a0b84..b5c4bb899fa 100644 --- a/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; + sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.4"; }; afm = { groups = ["default"]; @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11z3vnd8vh3ny1vx69bjrbck5b2g8zsbj94npyadpn7fdp8y3ldv"; + sha256 = "0yblqlbix3is5ihiqrpbfazb44in7ichfkjzdbsqibp48paanpl3"; type = "gem"; }; - version = "2.0.18"; + version = "2.0.20"; }; asciidoctor-pdf = { dependencies = ["asciidoctor" "concurrent-ruby" "matrix" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "treetop"]; @@ -46,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16mw0mlrrx44wn5j2knp3cv7b7phan90y4dr285c1qgdd25310xv"; + sha256 = "19c98a6riqhxxlc7kmksjslnyxdjp106ppsqy1vdbkjb39zfign3"; type = "gem"; }; - version = "2.3.2"; + version = "2.3.9"; }; coderay = { groups = ["default"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.2"; }; css_parser = { dependencies = ["addressable"]; @@ -77,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b"; + sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.0"; }; hashery = { groups = ["default"]; @@ -118,10 +118,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07chhyxf3qlr65jngns3z5187ibfibf5h2q59505vx45dfr3lvwz"; + sha256 = "09sx25jpnip2sp6wh5sn5ad7za78rfi95qp5iiczfh43z4jqa8q3"; type = "gem"; }; - version = "2.10.0"; + version = "2.11.0"; }; polyglot = { groups = ["default"]; @@ -193,20 +193,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; + sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; type = "gem"; }; - version = "5.0.0"; + version = "5.0.1"; }; "pygments.rb" = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "047mjyzz8v4kkgi1ap6fsjf7kcp6dwirpnigif00ss0hxsxchhac"; + sha256 = "080kb51l3m0n7xbbzmlcy78wsi03wr995v932v3b6lf6xa6nq8rg"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; rexml = { groups = ["default"]; @@ -223,10 +223,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "066w2wf3mwkzynz9h7qqvvr0w6rq6q45ngjfh9z0s08ny2gpdbmq"; + sha256 = "0pym2zjwl6dwdfvbn7rbvmds32r70jx9qddhvvi6pqy6987ack1v"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.2"; }; ruby-rc4 = { groups = ["default"]; @@ -238,16 +238,26 @@ }; version = "0.1.5"; }; + tilt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7"; + type = "gem"; + }; + version = "2.2.0"; + }; treetop = { dependencies = ["polyglot"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0697qz1akblf8r3wi0s2dsjh468hfsd57fb0mrp93z35y2ni6bhh"; + sha256 = "0adc8qblz8ii668r3rksjx83p675iryh52rvdvysimx2hkbasj7d"; type = "gem"; }; - version = "1.6.11"; + version = "1.6.12"; }; ttfunk = { groups = ["default"]; diff --git a/pkgs/tools/wayland/wlay/default.nix b/pkgs/tools/wayland/wlay/default.nix new file mode 100644 index 00000000000..a766a49d25d --- /dev/null +++ b/pkgs/tools/wayland/wlay/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, glfw3 +, libX11 +, libXau +, libXdmcp +, libepoxy +, libffi +, libxcb +, pkg-config +, wayland +, wayland-scanner +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wlay"; + version = "unstable-2022-01-26"; + + src = fetchFromGitHub { + owner = "atx"; + repo = "wlay"; + rev = "ed316060ac3ac122c0d3d8918293e19dfe9a6c90"; + hash = "sha256-Lu+EyoDHiXK9QzD4jdwbllCOCl2aEU+uK6/KxC2AUGQ="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wayland-scanner + ]; + + buildInputs = [ + extra-cmake-modules + glfw3 + libX11 + libXau + libXdmcp + libepoxy + libffi + libxcb + wayland + ]; + + strictDeps = true; + + meta = { + homepage = "https://github.com/atx/wlay"; + description = "Graphical output management for Wayland"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (wayland.meta) platforms; + }; +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bd0d9628593..5953fd17918 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1470,6 +1470,7 @@ mapAliases ({ radare2-cutter = cutter; # Added 2021-03-30 railcar = throw "'railcar' has been removed, as the upstream project has been abandoned"; # Added 2022-06-27 rambox-pro = rambox; # Added 2022-12-12 + rarian = throw "rarian has been removed as unused"; # Added 2023-07-05 raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # Added 2020-12-24 rawdog = throw "rawdog has been removed from nixpkgs as it still requires python2"; # Added 2022-01-01 rdiff_backup = throw "'rdiff_backup' has been renamed to/replaced by 'rdiff-backup'"; # Converted to throw 2022-02-22 @@ -1539,7 +1540,6 @@ mapAliases ({ scollector = throw "'scollector' has been renamed to/replaced by 'bosun'"; # Converted to throw 2022-02-22 scribusUnstable = throw "'scribusUnstable' has been renamed to 'scribus'"; # Added 2022-05-13 scrollkeeper = throw "'scrollkeeper' has been removed due to deprecated LibXML2 headers"; # Added 2022-11-08 - rarian = throw "rarian has been removed as unused"; # Added 2023-07-05 scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07 sdlmame = mame; # Added 2019-10-30 seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21 @@ -1572,6 +1572,7 @@ mapAliases ({ soldat-unstable = opensoldat; # Added 2022-07-02 solr_8 = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 + soundOfSorting = sound-of-sorting; # Added 2023-07-07 spark2 = throw "'spark2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_2_4 = throw "'spark_2_4' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_3_1 = throw "'spark_3_1' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 @@ -1824,7 +1825,7 @@ mapAliases ({ ### X ### - x11 = throw "'x11' has been renamed to/replaced by 'xlibsWrapper'"; # Converted to throw 2022-02-22 + x11 = throw "'x11' has been renamed to/replaced by its constituents"; # Converted to throw 2022-02-22 xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # Added 2020-06-24 xbmc = throw "'xbmc' has been renamed to/replaced by 'kodi'"; # Converted to throw 2022-02-22 xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # Added 2021-11-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d004d93bd8e..6dcf46a01bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1679,6 +1679,8 @@ with pkgs; fabs = callPackage ../tools/backup/fabs { }; + fm-tune = callPackage ../applications/radio/fm-tune { }; + fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { }; hblock = callPackage ../tools/networking/hblock { }; @@ -4520,6 +4522,8 @@ with pkgs; wdt = callPackage ../applications/networking/sync/wdt { }; + wlay = callPackage ../tools/wayland/wlay { }; + wl-clip-persist = callPackage ../tools/wayland/wl-clip-persist { }; wl-clipboard = callPackage ../tools/wayland/wl-clipboard { }; @@ -8998,6 +9002,8 @@ with pkgs; iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; + iperf3d = callPackage ../tools/networking/iperf3d { }; + ipfetch = callPackage ../tools/networking/ipfetch { }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; @@ -23243,6 +23249,8 @@ with pkgs; yaml-cpp_0_3 = callPackage ../development/libraries/yaml-cpp/0.3.0.nix { }; + yas = callPackage ../development/libraries/yas { }; + libyang = callPackage ../development/libraries/libyang { }; libcyaml = callPackage ../development/libraries/libcyaml { }; @@ -40333,7 +40341,7 @@ with pkgs; soundmodem = callPackage ../applications/radio/soundmodem { }; - soundOfSorting = callPackage ../misc/sound-of-sorting { }; + sound-of-sorting = callPackage ../misc/sound-of-sorting { }; sourceAndTags = callPackage ../misc/source-and-tags { hasktags = haskellPackages.hasktags; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2fe97d0170..9fa069d2f67 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1655,6 +1655,8 @@ self: super: with self; { can = callPackage ../development/python-modules/can { }; + canals = callPackage ../development/python-modules/canals { }; + canmatrix = callPackage ../development/python-modules/canmatrix { }; canonicaljson = callPackage ../development/python-modules/canonicaljson { }; @@ -3220,6 +3222,8 @@ self: super: with self; { edward = callPackage ../development/python-modules/edward { }; + effdet = callPackage ../development/python-modules/effdet { }; + effect = callPackage ../development/python-modules/effect { }; eggdeps = callPackage ../development/python-modules/eggdeps { }; @@ -8101,8 +8105,6 @@ self: super: with self; { poetry-dynamic-versioning = callPackage ../development/python-modules/poetry-dynamic-versioning { }; - poetry-plugin-export = callPackage ../development/python-modules/poetry-plugin-export { }; - poetry-semver = callPackage ../development/python-modules/poetry-semver { }; poezio = callPackage ../applications/networking/instant-messengers/poezio { }; |