diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5dc6add994ad..bcbb400b075a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4702,6 +4702,11 @@ githubId = 7875; name = "Rommel Martinez"; }; + eclairevoyant = { + github = "eclairevoyant"; + githubId = 848000; + name = "éclairevoyant"; + }; edanaher = { email = "nixos@edanaher.net"; github = "edanaher"; diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 6f782c00a011..2c247a2eff7e 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -136,6 +136,10 @@ - `pharo` has been updated to latest stable (PharoVM 10.0.5), which is compatible with the latest stable and oldstable images (Pharo 10 and 11). The VM in question is the 64bit Spur. The 32bit version has been dropped due to lack of maintenance. The Cog VM has been deleted because it is severily outdated. Finally, the `pharo-launcher` package has been deleted because it was not compatible with the newer VM, and due to lack of maintenance. +- Emacs mainline version 29 was introduced. This new version includes many major additions, most notably `tree-sitter` support (enabled by default) and the pgtk variant (useful for Wayland users), which is available under the attribute `emacs29-pgtk`. + +- Emacs macport version 29 was introduced. + ## Other Notable Changes {#sec-release-23.11-notable-changes} - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration. @@ -170,6 +174,8 @@ - `services.fail2ban.jails` can now be configured with attribute sets defining settings and filters instead of lines. The stringed options `daemonConfig` and `extraSettings` have respectively been replaced by `daemonSettings` and `jails.DEFAULT.settings` which use attribute sets. +- The application firewall `opensnitch` now uses the process monitor method eBPF as default as recommended by upstream. The method can be changed with the setting [services.opensnitch.settings.ProcMonitorMethod](#opt-services.opensnitch.settings.ProcMonitorMethod). + - The module [services.ankisyncd](#opt-services.ankisyncd.package) has been switched to [anki-sync-server-rs](https://github.com/ankicommunity/anki-sync-server-rs) from the old python version, which was difficult to update, had not been updated in a while, and did not support recent versions of anki. Unfortunately all servers supporting new clients (newer version of anki-sync-server, anki's built in sync server and this new rust package) do not support the older sync protocol that was used in the old server, so such old clients will also need updating and in particular the anki package in nixpkgs is also being updated in this release. The module update takes care of the new config syntax and the data itself (user login and cards) are compatible, so users of the module will be able to just log in again after updating both client and server without any extra action. diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 582334a5aeaf..10c37a46fdac 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/ny9r65799s7xhp605bc2753sjvzkxrrs-nix-2.15.1"; - i686-linux = "/nix/store/ck55dz5klc7szi8rx9ghhm8gi2b5q5bw-nix-2.15.1"; - aarch64-linux = "/nix/store/cl0a02vr28913dgw98hrm45a4baqr3z1-nix-2.15.1"; - x86_64-darwin = "/nix/store/wq228jdbz16pp2lnxf32n8dv27pw53p8-nix-2.15.1"; - aarch64-darwin = "/nix/store/x11cpsjg4q236msfz5scc325pfp9xy64-nix-2.15.1"; + x86_64-linux = "/nix/store/3wqasl97rjiza3vd7fxjnvli2w9l30mk-nix-2.17.0"; + i686-linux = "/nix/store/z360xswxfx55pmm1fng3hw748rbs0kkj-nix-2.17.0"; + aarch64-linux = "/nix/store/9670sxa916xmv8n1kqs7cdvmnsrhrdjv-nix-2.17.0"; + x86_64-darwin = "/nix/store/2rdbky9j8hc3mbgl6pnda4hkjllyfwnn-nix-2.17.0"; + aarch64-darwin = "/nix/store/jl9qma14fb4zk9lq1k0syw2k9qm2gqjw-nix-2.17.0"; } diff --git a/nixos/modules/services/security/opensnitch.nix b/nixos/modules/services/security/opensnitch.nix index 98695b1ef060..013aeb16756c 100644 --- a/nixos/modules/services/security/opensnitch.nix +++ b/nixos/modules/services/security/opensnitch.nix @@ -147,7 +147,7 @@ in { config = mkIf cfg.enable { # pkg.opensnitch is referred to elsewhere in the module so we don't need to worry about it being garbage collected - services.opensnitch.settings = mapAttrs (_: v: mkDefault v) (builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile "${pkgs.opensnitch}/etc/default-config.json"))); + services.opensnitch.settings = mapAttrs (_: v: mkDefault v) (builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile "${pkgs.opensnitch}/etc/opensnitchd/default-config.json"))); systemd = { packages = [ pkgs.opensnitch ]; @@ -171,9 +171,19 @@ in { ${concatMapStrings ({ file, local }: '' ln -sf '${file}' "${local}" '') rules} + + if [ ! -f /etc/opensnitch-system-fw.json ]; then + cp "${pkgs.opensnitch}/etc/opensnitchd/system-fw.json" "/etc/opensnitchd/system-fw.json" + fi ''); - environment.etc."opensnitchd/default-config.json".source = format.generate "default-config.json" cfg.settings; + environment.etc = mkMerge [ ({ + "opensnitchd/default-config.json".source = format.generate "default-config.json" cfg.settings; + }) (mkIf (cfg.settings.ProcMonitorMethod == "ebpf") { + "opensnitchd/opensnitch.o".source = "${config.boot.kernelPackages.opensnitch-ebpf}/etc/opensnitchd/opensnitch.o"; + "opensnitchd/opensnitch-dns.o".source = "${config.boot.kernelPackages.opensnitch-ebpf}/etc/opensnitchd/opensnitch-dns.o"; + "opensnitchd/opensnitch-procs.o".source = "${config.boot.kernelPackages.opensnitch-ebpf}/etc/opensnitchd/opensnitch-procs.o"; + })]; }; } diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix index 0e75f373dc2c..4c5417ab99fc 100644 --- a/pkgs/applications/audio/spotify-player/default.nix +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+YPtu3hsKvk2KskVSpqcFufnWL5PxN8+xbkcz/JXW6g="; + hash = "sha256-5+YBlXHpAzGgw6MqgnMSggCASS++A/WWomftX8Jxe7g="; }; - cargoHash = "sha256-WgQ+v9dJyriqq7+WpXpPhjdwm2Sr0jozA1oW2inSPik="; + cargoHash = "sha256-PIYaJC3rVbPjc2CASzMGWAzUdrBwFnKqhrZO6nywdN8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index 4360defc18d4..c0cce2efe03e 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "tageditor"; - version = "3.7.9"; + version = "3.8.1"; src = fetchFromGitHub { owner = "martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-QQvc9S+9h0Qy/qBROwJMZIALf/Rbj/9my4PZGxQzlnM="; + hash = "sha256-7YmjrVh8P3XfnNs2I8PoLigfVvzS0UnuAC67ZQp7WdA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index b2edc8597013..fe3c5d9ec512 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -54,7 +54,16 @@ lib.makeScope pkgs.newScope (self: withPgtk = true; }; - emacs-macport = callPackage (self.sources.emacs-macport) { + emacs28-macport = callPackage (self.sources.emacs28-macport) { + inherit gconf; + + inherit (pkgs.darwin) sigtool; + inherit (pkgs.darwin.apple_sdk.frameworks) + AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz + QuartzCore WebKit; + }; + + emacs29-macport = callPackage (self.sources.emacs29-macport) { inherit gconf; inherit (pkgs.darwin) sigtool; diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 440184d959e0..b9b18a98ac88 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -4,9 +4,13 @@ }: let - mainlineMeta = { - homepage = "https://www.gnu.org/software/emacs/"; - description = "The extensible, customizable GNU text editor"; + metaFor = variant: version: rev: { + homepage = { + "mainline" = "https://www.gnu.org/software/emacs/"; + "macport" = "https://bitbucket.org/mituharu/emacs-mac/"; + }.${variant}; + description = "The extensible, customizable GNU text editor" + + lib.optionalString (variant == "macport") " - macport variant"; longDescription = '' GNU Emacs is an extensible, customizable text editor—and more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp programming @@ -21,7 +25,15 @@ let functionality, including a project planner, mail and news reader, debugger interface, calendar, and more. Many of these extensions are distributed with GNU Emacs; others are available separately. + '' + lib.optionalString (variant == "macport") '' + + This release is built from Mitsuharu Yamamoto's patched source code + tailored for macOS. ''; + changelog = { + "mainline" = "https://www.gnu.org/savannah-checkouts/gnu/emacs/news/NEWS.${version}"; + "macport" = "https://bitbucket.org/mituharu/emacs-mac/raw/${rev}/NEWS-mac"; + }.${variant}; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ AndersonTorres @@ -31,7 +43,10 @@ let lovek323 matthewbauer ]; - platforms = lib.platforms.all; + platforms = { + "mainline" = lib.platforms.all; + "macport" = lib.platforms.darwin; + }.${variant}; mainProgram = "emacs"; }; in @@ -46,23 +61,23 @@ in hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag="; }; - meta = mainlineMeta; + meta = metaFor "mainline" "28.2" "28.2"; }; emacs29 = import ./generic.nix { pname = "emacs"; - version = "29.1-rc1"; + version = "29.1"; variant = "mainline"; src = fetchFromSavannah { repo = "emacs"; - rev = "29.1-rc1"; - hash = "sha256-p0lBSKsHrFwYTqO5UVIF/PgiqwdhYQE4oUVcPtd+gsU="; + rev = "29.1"; + hash = "sha256-3HDCwtOKvkXwSULf3W7YgTz4GV8zvYnh2RrL28qzGKg="; }; - meta = mainlineMeta; + meta = metaFor "mainline" "29.1" "29.1"; }; - emacs-macport = import ./generic.nix { + emacs28-macport = import ./generic.nix { pname = "emacs-mac"; version = "28.2"; variant = "macport"; @@ -73,16 +88,21 @@ in hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE="; }; - meta = { - homepage = "https://bitbucket.org/mituharu/emacs-mac/"; - description = mainlineMeta.description + " - with macport patches"; - longDescription = mainlineMeta.longDescription + '' + meta = metaFor "macport" "28.2" "emacs-28.2-mac-9.1"; + }; - This release is built from Mitsuharu Yamamoto's patched source code - tailoired for MacOS X. - ''; - inherit (mainlineMeta) license maintainers; - platforms = lib.platforms.darwin; + emacs29-macport = import ./generic.nix { + pname = "emacs-mac"; + version = "29.1"; + variant = "macport"; + + src = fetchFromBitbucket { + owner = "mituharu"; + repo = "emacs-mac"; + rev = "emacs-29.1-mac-10.0"; + hash = "sha256-TE829qJdPjeOQ+kD0SfyO8d5YpJjBge/g+nScwj+XVU="; }; + + meta = metaFor "macport" "29.1" "emacs-29.1-mac-10.0"; }; } diff --git a/pkgs/applications/editors/pixelorama/default.nix b/pkgs/applications/editors/pixelorama/default.nix index e883ba36d5fb..6c01f8e05d3a 100644 --- a/pkgs/applications/editors/pixelorama/default.nix +++ b/pkgs/applications/editors/pixelorama/default.nix @@ -9,13 +9,13 @@ let else throw "unsupported platform"; in stdenv.mkDerivation (finalAttrs: { pname = "pixelorama"; - version = "0.11"; + version = "0.11.1"; src = fetchFromGitHub { owner = "Orama-Interactive"; repo = "Pixelorama"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-r4iQJBxXzIbQ7n19Ah6szuIfALmuKlHKcvKsxEzOttk="; + sha256 = "sha256-+gPkuVzQ86MzHQ0AjnPDdyk2p7eIxtggq+KJ43KVbk8="; }; nativeBuildInputs = [ @@ -52,6 +52,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://orama-interactive.itch.io/pixelorama"; description = "A free & open-source 2D sprite editor, made with the Godot Engine!"; + changelog = "https://github.com/Orama-Interactive/Pixelorama/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.mit; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ felschr ]; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f14cf064c8bd..010476b35491 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -517,7 +517,7 @@ self: super: { }); fuzzy-nvim = super.fuzzy-nvim.overrideAttrs { - dependencies = with self; [ telescope-fzy-native-nvim ]; + dependencies = with self; [ telescope-fzf-native-nvim ]; }; fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs { diff --git a/pkgs/applications/file-managers/fm/default.nix b/pkgs/applications/file-managers/fm/default.nix new file mode 100644 index 000000000000..9c13e7f42b96 --- /dev/null +++ b/pkgs/applications/file-managers/fm/default.nix @@ -0,0 +1,45 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, wrapGAppsHook4 +, libadwaita +, libpanel +, gtksourceview5 +, poppler +}: + +rustPlatform.buildRustPackage { + pname = "fm"; + version = "unstable-2023-07-25"; + + src = fetchFromGitHub { + owner = "euclio"; + repo = "fm"; + rev = "a0830b5483a48a8b1e40982f20c28dcb5bfe4a6e"; + hash = "sha256-uso7j+bf6PF5wiTzSJymSxNNfzqXVcJygkfGdzQl4xA="; + }; + + cargoHash = "sha256-3IxpnDYbfLI1VAMgqIE4eSkiT9Z6HcC3K6MH6uqD9Ic="; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + libadwaita + libpanel + gtksourceview5 + poppler + ]; + + meta = with lib; { + description = "Small, general purpose file manager built with GTK4"; + homepage = "https://github.com/euclio/fm"; + license = licenses.mit; + maintainers = with maintainers; [ aleksana ]; + mainProgram = "fm"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index 77e42cda4d23..eac305bd399e 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "charm"; - version = "0.12.5"; + version = "0.12.6"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "sha256-lTjpvh0bl4Fk+d3mcDvVQY3Ef6UYE23qoS60nltVcsU="; + sha256 = "sha256-RtUHJIMbodICEDIhjH/QZlAS7dxBsL/uNYA2IoObAg0="; }; - vendorSha256 = "sha256-TNxAtx+fT6CEpa2g/tNl9sCwt3kAmNq7G870TPt2MQ4="; + vendorHash = "sha256-V5azvQ8vMkgF2Myt6h5Gw09b+Xwg1XLyTImG52qQ+20="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix index 55bd926fb7fa..cb39e26994f5 100644 --- a/pkgs/applications/misc/notesnook/default.nix +++ b/pkgs/applications/misc/notesnook/default.nix @@ -2,7 +2,7 @@ let pname = "notesnook"; - version = "2.5.7"; + version = "2.6.1"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}"; hash = { - x86_64-linux = "sha256-M/59pjhuKF/MOMpT9/qrlThHO0V8e49cfiaWMkEWHNg="; - x86_64-darwin = "sha256-cluIizmweIMU6RIFxoEQ3DYChRVEuVLxrPjwfFfeq1w="; - aarch64-darwin = "sha256-cbBnKrb8poyDL1D+32UrOl3RXt8Msncw440qra9+Gs0="; + x86_64-linux = "sha256-PLHP1Q4+xcHyr0323K4BD+oH57SspsrAcxRe/C6RFDU="; + x86_64-darwin = "sha256-gOUL3qLSM+/pr519Gc0baUtbmhA40lG6XzuCRyGILkc="; + aarch64-darwin = "sha256-d1nXdCv1mK4+4Gef1upIkHS3J2d9qzTLXbBWabsJwpw="; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/rofi-bluetooth/default.nix b/pkgs/applications/misc/rofi-bluetooth/default.nix index d9824ca9977a..01307494340c 100644 --- a/pkgs/applications/misc/rofi-bluetooth/default.nix +++ b/pkgs/applications/misc/rofi-bluetooth/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/nickclyde/rofi-bluetooth"; license = licenses.gpl3Only; maintainers = with maintainers; [ MoritzBoehme ]; + mainProgram = "rofi-bluetooth"; platforms = platforms.linux; }; }) diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index d98021bf6e2e..326e03721ece 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -3,6 +3,9 @@ , python3 , fetchFromGitHub , pcre2 +, libnotify +, libappindicator +, pkg-config , gnome , makeWrapper , removeReferencesTo @@ -10,19 +13,19 @@ flutter37.buildFlutterApplication rec { pname = "yubioath-flutter"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubioath-flutter"; rev = version; - sha256 = "sha256-N9/qwC79mG9r+zMPLHSPjNSQ+srGtnXuKsf0ijtH7CI="; + hash = "sha256-NgzijuvyWNl9sFQzq1Jzk1povF8c/rKuVyVKeve+Vic="; }; passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; depsListFile = ./deps.json; - vendorHash = "sha256-WfZiB7MO4wHUg81xm67BMu4zQdC9CfhN5BQol+AI2S8="; + vendorHash = "sha256-q/dNj9Pu7zg0HkV2QkXBbXiTsljsSJOqXhvAQlnoLlA="; postPatch = '' substituteInPlace linux/CMakeLists.txt \ @@ -68,10 +71,13 @@ flutter37.buildFlutterApplication rec { nativeBuildInputs = [ makeWrapper removeReferencesTo + pkg-config ]; buildInputs = [ pcre2 + libnotify + libappindicator ]; disallowedReferences = [ diff --git a/pkgs/applications/misc/yubioath-flutter/deps.json b/pkgs/applications/misc/yubioath-flutter/deps.json index 1ce525f799bd..6d7414da346e 100644 --- a/pkgs/applications/misc/yubioath-flutter/deps.json +++ b/pkgs/applications/misc/yubioath-flutter/deps.json @@ -1,7 +1,7 @@ [ { "name": "yubico_authenticator", - "version": "6.1.0+60100", + "version": "6.2.0+60200", "kind": "root", "source": "root", "dependencies": [ @@ -17,8 +17,18 @@ "freezed_annotation", "window_manager", "qrscanner_zxing", + "screen_retriever", "desktop_drop", "url_launcher", + "path_provider", + "vector_graphics", + "vector_graphics_compiler", + "path", + "file_picker", + "archive", + "crypto", + "tray_manager", + "local_notifier", "integration_test", "flutter_test", "flutter_lints", @@ -29,7 +39,7 @@ }, { "name": "json_serializable", - "version": "6.5.4", + "version": "6.6.1", "kind": "dev", "source": "hosted", "dependencies": [ @@ -60,7 +70,7 @@ }, { "name": "source_gen", - "version": "1.2.6", + "version": "1.2.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -69,7 +79,6 @@ "build", "dart_style", "glob", - "meta", "path", "source_span", "yaml" @@ -116,7 +125,7 @@ { "name": "path", "version": "1.8.2", - "kind": "transitive", + "kind": "direct", "source": "hosted", "dependencies": [] }, @@ -127,16 +136,9 @@ "source": "hosted", "dependencies": [] }, - { - "name": "meta", - "version": "1.8.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, { "name": "glob", - "version": "2.1.0", + "version": "2.1.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -157,6 +159,13 @@ "path" ] }, + { + "name": "meta", + "version": "1.8.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, { "name": "async", "version": "2.10.0", @@ -192,14 +201,14 @@ }, { "name": "args", - "version": "2.3.1", + "version": "2.4.0", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "analyzer", - "version": "5.2.0", + "version": "5.6.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -239,7 +248,7 @@ { "name": "crypto", "version": "3.0.2", - "kind": "transitive", + "kind": "direct", "source": "hosted", "dependencies": [ "typed_data" @@ -265,7 +274,7 @@ }, { "name": "_fe_analyzer_shared", - "version": "50.0.0", + "version": "54.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -290,7 +299,7 @@ }, { "name": "logging", - "version": "1.1.0", + "version": "1.1.1", "kind": "direct", "source": "hosted", "dependencies": [] @@ -310,7 +319,7 @@ }, { "name": "json_annotation", - "version": "4.7.0", + "version": "4.8.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -319,7 +328,7 @@ }, { "name": "checked_yaml", - "version": "2.0.1", + "version": "2.0.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -412,7 +421,7 @@ }, { "name": "web_socket_channel", - "version": "2.2.0", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -432,7 +441,7 @@ }, { "name": "timing", - "version": "1.0.0", + "version": "1.0.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -504,7 +513,7 @@ }, { "name": "mime", - "version": "1.0.3", + "version": "1.0.4", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -520,7 +529,7 @@ }, { "name": "io", - "version": "1.0.3", + "version": "1.0.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -559,7 +568,7 @@ }, { "name": "code_builder", - "version": "4.3.0", + "version": "4.4.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -582,7 +591,7 @@ }, { "name": "built_value", - "version": "8.4.2", + "version": "8.4.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -594,7 +603,7 @@ }, { "name": "fixnum", - "version": "1.0.1", + "version": "1.1.0", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -634,13 +643,14 @@ }, { "name": "build_resolvers", - "version": "2.1.0", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ "analyzer", "async", "build", + "collection", "crypto", "graphs", "logging", @@ -654,7 +664,7 @@ }, { "name": "build_daemon", - "version": "3.1.0", + "version": "3.1.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -861,7 +871,7 @@ { "name": "archive", "version": "3.3.2", - "kind": "transitive", + "kind": "direct", "source": "hosted", "dependencies": [ "crypto", @@ -945,44 +955,86 @@ ] }, { - "name": "url_launcher", - "version": "6.1.7", + "name": "local_notifier", + "version": "0.1.5", "kind": "direct", "source": "hosted", "dependencies": [ "flutter", - "url_launcher_android", - "url_launcher_ios", - "url_launcher_linux", - "url_launcher_macos", - "url_launcher_platform_interface", - "url_launcher_web", - "url_launcher_windows" + "uuid" ] }, { - "name": "url_launcher_windows", - "version": "3.0.1", + "name": "uuid", + "version": "3.0.7", "kind": "transitive", "source": "hosted", "dependencies": [ - "flutter", - "url_launcher_platform_interface" + "crypto" ] }, { - "name": "url_launcher_platform_interface", - "version": "2.1.1", - "kind": "transitive", + "name": "tray_manager", + "version": "0.2.0", + "kind": "direct", "source": "hosted", "dependencies": [ "flutter", - "plugin_platform_interface" + "menu_base", + "path", + "shortid" ] }, + { + "name": "shortid", + "version": "0.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "menu_base", + "version": "0.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "file_picker", + "version": "5.2.7", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "flutter_plugin_android_lifecycle", + "plugin_platform_interface", + "ffi", + "path", + "win32" + ] + }, + { + "name": "win32", + "version": "3.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi" + ] + }, + { + "name": "ffi", + "version": "2.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, { "name": "plugin_platform_interface", - "version": "2.1.3", + "version": "2.1.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -990,14 +1042,12 @@ ] }, { - "name": "url_launcher_web", - "version": "2.0.13", + "name": "flutter_plugin_android_lifecycle", + "version": "2.0.7", "kind": "transitive", "source": "hosted", "dependencies": [ - "flutter", - "flutter_web_plugins", - "url_launcher_platform_interface" + "flutter" ] }, { @@ -1015,9 +1065,198 @@ "vector_math" ] }, + { + "name": "vector_graphics_compiler", + "version": "1.1.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "args", + "meta", + "path_parsing", + "xml", + "vector_graphics_codec" + ] + }, + { + "name": "vector_graphics_codec", + "version": "1.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "xml", + "version": "6.2.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta", + "petitparser" + ] + }, + { + "name": "petitparser", + "version": "5.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "path_parsing", + "version": "1.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "vector_math", + "meta" + ] + }, + { + "name": "vector_graphics", + "version": "1.1.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "vector_graphics_codec" + ] + }, + { + "name": "path_provider", + "version": "2.0.14", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_android", + "path_provider_foundation", + "path_provider_linux", + "path_provider_platform_interface", + "path_provider_windows" + ] + }, + { + "name": "path_provider_windows", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "path", + "path_provider_platform_interface", + "win32" + ] + }, + { + "name": "path_provider_platform_interface", + "version": "2.0.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "platform", + "plugin_platform_interface" + ] + }, + { + "name": "path_provider_linux", + "version": "2.1.9", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "path", + "path_provider_platform_interface", + "xdg_directories" + ] + }, + { + "name": "xdg_directories", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path", + "process" + ] + }, + { + "name": "path_provider_foundation", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_platform_interface" + ] + }, + { + "name": "path_provider_android", + "version": "2.0.22", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_platform_interface" + ] + }, + { + "name": "url_launcher", + "version": "6.1.10", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_android", + "url_launcher_ios", + "url_launcher_linux", + "url_launcher_macos", + "url_launcher_platform_interface", + "url_launcher_web", + "url_launcher_windows" + ] + }, + { + "name": "url_launcher_windows", + "version": "3.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_platform_interface", + "version": "2.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "url_launcher_web", + "version": "2.0.15", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "url_launcher_platform_interface" + ] + }, { "name": "url_launcher_macos", - "version": "3.0.1", + "version": "3.0.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1027,7 +1266,7 @@ }, { "name": "url_launcher_linux", - "version": "3.0.1", + "version": "3.0.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1037,7 +1276,7 @@ }, { "name": "url_launcher_ios", - "version": "6.0.17", + "version": "6.1.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1047,7 +1286,7 @@ }, { "name": "url_launcher_android", - "version": "6.0.22", + "version": "6.0.24", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1057,7 +1296,7 @@ }, { "name": "desktop_drop", - "version": "0.4.0", + "version": "0.4.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1068,7 +1307,7 @@ }, { "name": "cross_file", - "version": "0.3.3+2", + "version": "0.3.3+4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1076,6 +1315,15 @@ "meta" ] }, + { + "name": "screen_retriever", + "version": "0.1.6", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, { "name": "qrscanner_zxing", "version": "1.0.0", @@ -1088,7 +1336,7 @@ }, { "name": "window_manager", - "version": "0.3.0", + "version": "0.3.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1097,18 +1345,9 @@ "screen_retriever" ] }, - { - "name": "screen_retriever", - "version": "0.1.4", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter" - ] - }, { "name": "flutter_riverpod", - "version": "2.1.3", + "version": "2.3.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1130,7 +1369,7 @@ }, { "name": "riverpod", - "version": "2.1.3", + "version": "2.3.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1142,7 +1381,7 @@ }, { "name": "shared_preferences", - "version": "2.0.16", + "version": "2.1.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1157,7 +1396,7 @@ }, { "name": "shared_preferences_windows", - "version": "2.1.1", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1171,7 +1410,7 @@ }, { "name": "shared_preferences_platform_interface", - "version": "2.1.0", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1179,49 +1418,9 @@ "plugin_platform_interface" ] }, - { - "name": "path_provider_windows", - "version": "2.1.3", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "ffi", - "flutter", - "path", - "path_provider_platform_interface", - "win32" - ] - }, - { - "name": "win32", - "version": "3.1.2", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "ffi" - ] - }, - { - "name": "ffi", - "version": "2.0.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "path_provider_platform_interface", - "version": "2.0.5", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "platform", - "plugin_platform_interface" - ] - }, { "name": "shared_preferences_web", - "version": "2.0.4", + "version": "2.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1232,7 +1431,7 @@ }, { "name": "shared_preferences_linux", - "version": "2.1.1", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1244,33 +1443,9 @@ "shared_preferences_platform_interface" ] }, - { - "name": "path_provider_linux", - "version": "2.1.7", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "ffi", - "flutter", - "path", - "path_provider_platform_interface", - "xdg_directories" - ] - }, - { - "name": "xdg_directories", - "version": "0.2.0+2", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "meta", - "path", - "process" - ] - }, { "name": "shared_preferences_foundation", - "version": "2.1.1", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1280,7 +1455,7 @@ }, { "name": "shared_preferences_android", - "version": "2.0.14", + "version": "2.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/applications/misc/yubioath-flutter/helper.nix index e40f6a78c862..ca0bf4472a4c 100644 --- a/pkgs/applications/misc/yubioath-flutter/helper.nix +++ b/pkgs/applications/misc/yubioath-flutter/helper.nix @@ -1,4 +1,5 @@ { buildPythonApplication +, python3 , poetry-core , yubikey-manager , fido2 @@ -19,13 +20,16 @@ buildPythonApplication { sourceRoot = "${src.name}/helper"; format = "pyproject"; + nativeBuildInputs = [ + python3.pkgs.pythonRelaxDepsHook + ]; + + pythonRelaxDeps = true; + postPatch = '' - sed -i \ - -e 's,zxing-cpp = .*,zxing-cpp = "*",g' \ - -e 's,mss = .*,mss = "*",g' \ - -e 's,yubikey-manager = .*,yubikey-manager = "*",g' \ - -e 's,Pillow = .*,Pillow = "*",g' \ - pyproject.toml + substituteInPlace pyproject.toml \ + --replace "authenticator-helper" "yubioath-flutter-helper" \ + --replace "0.1.0" "${version}" ''; postInstall = '' diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index adfb76f485e7..e7a9f8cf6804 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "yandex-browser"; - version = "23.5.4.682-1"; + version = "23.7.1.1148-1"; src = fetchurl { url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb"; - sha256 = "sha256-ZhPX4K9huCO2uyjfUsWEkaspdvUurB7jNfUMqqIFO4U="; + sha256 = "sha256-SJbuT2MnsXcqOSk4xCUokseDotjbWgAnvwnfNPF9zi4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index ed9cf85640e2..efca89de7cbb 100644 --- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "whatsapp-for-linux"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "eneshecan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YmiEzemoGLwCUVfnuTmruSkI0oBg7yNuodWmXTMGh8g="; + sha256 = "sha256-DU9tvIvDfOtBydR68yeRMFYdMjiBrOobCDXIZMmm7pQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index c0b3d3c0f289..7da1a368d845 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "owncloud-client"; - version = "4.1.0"; + version = "4.2.0"; libregraph = callPackage ./libre-graph-api-cpp-qt-client.nix { }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "owncloud"; repo = "client"; rev = "refs/tags/v${version}"; - hash = "sha256-L0xeLYzlonzNClOcijyucGdwgQHTS7TlczIyJGbVQ5E="; + hash = "sha256-dPNVp5DxCI4ye8eFjHoLGDlf8Ap682o1UB0k2VNr2rs="; }; nativeBuildInputs = [ pkg-config cmake extra-cmake-modules wrapQtAppsHook qttools ]; diff --git a/pkgs/applications/networking/p2p/pyrosimple/default.nix b/pkgs/applications/networking/p2p/pyrosimple/default.nix index 7ac355690c0b..15e7304ef9b9 100644 --- a/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pyrosimple"; - version = "2.9.1"; + version = "2.10.2"; format = "pyproject"; src = fetchFromGitHub { owner = "kannibalox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-eRj9zHbopzwPvB3YxN5P8A/Dqwvh+FcIr+pEC0ov/xg="; + hash = "sha256-3ZsRJNGbcKGU6v2uYUintMpKY8Z/DyTIDDxTsDEV6lw="; }; pythonRelaxDeps = [ diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index 063833297b98..4d7bb155f5cc 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib mpv-unwrapped ]; + postPatch = '' + substituteInPlace Makefile --replace 'PKG_CONFIG =' 'PKG_CONFIG ?=' + ''; + installFlags = [ "SCRIPTS_DIR=$(out)/share/mpv/scripts" ]; # Otherwise, the shared object isn't `strip`ped. See: diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 4460c5f90b76..8656db60c4ee 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "2.13.c.4"; + version = "2.13.c.5"; pname = "i3lock-color"; src = fetchFromGitHub { owner = "PandorasFox"; repo = "i3lock-color"; rev = version; - sha256 = "sha256-bbjkvgSKD57sdOtPYGLAKpQoIsJnF6s6ySq4dTWC3tI="; + sha256 = "sha256-fuLeglRif2bruyQRqiL3nm3q6qxoHcPdVdL+QjGBR/k="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 2c0a481676ff..b8dffa259d76 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://i3wm.org/i3lock/"; maintainers = with maintainers; [ malyn domenkozar ]; + mainProgram = "i3lock"; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 8864f3923f91..1e07a3a39ebb 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20230730120627"; + version = "20230810162343"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-lnTP8KDYdIa7iq14h0TEVfAlJDtsURfSZaEdQ8L1TRM="; + hash = "sha256-RzYFpbiy0ajOjyu9Fdw+aJX9cLbquXzfWiLPaszyxOY="; }; vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8="; meta = with lib; { diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index b781251a7ca7..bdac030ed341 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -6,11 +6,12 @@ , itstool , libxml2 , gtk3 -, file , mate , hicolor-icon-theme , wrapGAppsHook , mateUpdateScript +# can be defaulted to true once engrampa builds with meson (version > 1.27.0) +, withMagic ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, file }: stdenv.mkDerivation rec { @@ -26,20 +27,22 @@ stdenv.mkDerivation rec { pkg-config gettext itstool + libxml2 # for xmllint wrapGAppsHook ]; buildInputs = [ - libxml2 gtk3 - file #libmagic mate.caja hicolor-icon-theme mate.mate-desktop + ] ++ lib.optionals withMagic [ + file ]; configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" + ] ++ lib.optionals withMagic [ "--enable-magic" ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 7bdcd1dbac98..6411971fdb05 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -6,40 +6,34 @@ , meson , ninja , vala -, python3 , gtk3 , granite , libgee , libhandy -, clutter-gst -, clutter-gtk , gst_all_1 , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "elementary-videos"; - version = "2.9.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "videos"; rev = version; - sha256 = "sha256-G961ndONwHiqdeO26Ulxkg71ByfdFMAV35VFzu4TQ3M="; + sha256 = "sha256-O98478E3NlY2NYqjyy8mcXZ3lG+wIV+VrPzdzOp44yA="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 vala wrapGAppsHook ]; buildInputs = [ - clutter-gst - clutter-gtk granite gtk3 libgee @@ -48,16 +42,12 @@ stdenv.mkDerivation rec { gst-libav gst-plugins-bad gst-plugins-base - gst-plugins-good + # https://github.com/elementary/videos/issues/356 + (gst-plugins-good.override { gtkSupport = true; }) gst-plugins-ugly gstreamer ]); - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 6958547899fa..e3fd576a14e0 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -24,6 +25,23 @@ stdenv.mkDerivation rec { sha256 = "sha256-YFI1UM7CxjYkoIhSg9Fn81Ze6DX7D7p89xibk7ik8bI="; }; + patches = [ + # Don't set picture-uri-dark. elementary-gsettings-schemas won't + # aware of our custom remove-backgrounds.gschema.override so it + # will be a confusing invalid value otherwise (though gala actually + # can handle it well). + # https://github.com/elementary/default-settings/pull/282 + (fetchpatch { + url = "https://github.com/elementary/default-settings/commit/881f84b8316e549ab627b7ac9acf352e0346a1a4.patch"; + sha256 = "sha256-zf2Anr+ljLjHbn5ZmRj3nCRVJ52rwe4EkwdIfSOGeLQ="; + }) + # https://github.com/elementary/default-settings/pull/283 + (fetchpatch { + url = "https://github.com/elementary/default-settings/commit/37ef6062a8651875dd9d927c5730155c8b26e953.patch"; + sha256 = "sha256-u7rrwuHgMPn1eIyIuwJcBgy8SshaXgrgFTSNm8IHbaY="; + }) + ]; + nativeBuildInputs = [ accountsservice dbus diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index e5a90d8f4f0a..439d434488ef 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -5,7 +5,6 @@ , meson , ninja , pkg-config -, python3 , vala , wrapGAppsHook4 , appcenter @@ -19,20 +18,19 @@ stdenv.mkDerivation rec { pname = "elementary-onboarding"; - version = "7.1.0"; + version = "7.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = "onboarding"; rev = version; - sha256 = "sha256-OWALEcVOOh7wjEEvysd+MQhB/iK3105XCIVp5pklMwY="; + sha256 = "sha256-5vEKQUGg5KQSheM6tSK8uieEfCqlY6pABfPb/333FHU="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 vala wrapGAppsHook4 ]; @@ -47,11 +45,6 @@ stdenv.mkDerivation rec { libgee ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 745f8b6c0149..ebf99d6ed0fa 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "7.1.1"; + version = "7.1.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-s63znprGrMvitefAKlbL3r1s0kbo7NA9bhrNH8w0h2o="; + sha256 = "sha256-g+Zcdl6SJ4uO6I1x3Ru6efZkf+O3UaW790n/zxmGkHU="; }; patches = [ diff --git a/pkgs/development/compilers/flutter/engine-artifacts/default.nix b/pkgs/development/compilers/flutter/engine-artifacts/default.nix index 41201bdb94e5..603b1456018d 100644 --- a/pkgs/development/compilers/flutter/engine-artifacts/default.nix +++ b/pkgs/development/compilers/flutter/engine-artifacts/default.nix @@ -19,10 +19,14 @@ let version = engineVersion; dontUnpack = true; src = fetchurl { + pname = "flutter-sky_engine-LICENSE"; + version = engineVersion; url = "https://raw.githubusercontent.com/flutter/engine/${engineVersion}/sky/packages/sky_engine/LICENSE"; sha256 = hashes.skyNotice; }; flutterNotice = fetchurl { + pname = "flutter-LICENSE"; + version = engineVersion; url = "https://raw.githubusercontent.com/flutter/flutter/${flutterVersion}/LICENSE"; sha256 = hashes.flutterNotice; }; diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix index f51e43b2474f..1c8a5dc4059f 100644 --- a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix +++ b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix @@ -1,6 +1,6 @@ { "1a65d409c7a1438a34d21b60bf30a6fd5db59314" = { - skyNotice = "sha256-n9B26rLlfUqdR6s+2+PNK4H/fN95UE0T7/Vic19W6yo="; + skyNotice = "sha256-+EitMZAAvJ1mIlfm5ZTfY+pk8tfyu33XM7P8qOdj+J8="; flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA="; android-arm = { "artifacts.zip" = "sha256-KDMiI6SQoZHfFV5LJJZ7VOGyEKC4UxzRc777j4BbXgM="; diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/development/compilers/tvm/default.nix index a26096b540fc..e72cc3cdb93a 100644 --- a/pkgs/development/compilers/tvm/default.nix +++ b/pkgs/development/compilers/tvm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tvm"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "apache"; repo = "incubator-tvm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-NHfYx45Zad+jsILR24c2U+Xmb2rKaTyl8xl5uxAFtak="; + sha256 = "sha256-WG0vU3lxX5FNs0l37mTE1T7rSEEtfTEisE3cMphzeAk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/interpreters/kamilalisp/default.nix b/pkgs/development/interpreters/kamilalisp/default.nix index 9b990afaa57f..e0554e10b421 100644 --- a/pkgs/development/interpreters/kamilalisp/default.nix +++ b/pkgs/development/interpreters/kamilalisp/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "kamilalisp"; - version = "0.2p"; + version = "0.3.0.1"; src = fetchurl { - url = "https://github.com/kspalaiologos/kamilalisp/releases/download/v${version}/kamilalisp-${lib.versions.majorMinor version}.jar"; - hash = "sha256-6asl9zRTidDxWsgIRxUA1ygYug/aqiQ5XAEwWYNOfKE="; + url = "https://github.com/kspalaiologos/kamilalisp/releases/download/v${version}/kamilalisp-${version}.jar"; + hash = "sha256-SW0U483eHptkYw+yJV/2cImfK3uEjkl8ma54yeagF6s="; }; dontUnpack = true; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 3d4ee70e7a04..4bbeb224ce3d 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -8,8 +8,8 @@ let # base_version is of the form major.minor.patch # vc_version is of the form YYMMDDCC # version corresponds to the tag on GitHub - base_version = "8.1.0"; - vc_version = "23051307"; + base_version = "8.1.1"; + vc_version = "23060707"; in stdenv.mkDerivation rec { pname = "renpy"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { owner = "renpy"; repo = "renpy"; rev = version; - sha256 = "sha256-5EU4jaBTU+a9UNHRs7xrKQ7ZivhDEqisO3l4W2E6F+c="; + sha256 = "sha256-aJ/MobZ6SNBYRC/EpUxAMLJ3pwK6PC92DV0YL/LF5Ew="; }; nativeBuildInputs = [ @@ -49,9 +49,11 @@ in stdenv.mkDerivation rec { cp tutorial/game/tutorial_director.rpy{m,} cat > renpy/vc_version.py << EOF - vc_version = ${vc_version} + version = '${version}' official = False nightly = False + # Look at https://renpy.org/latest.html for what to put. + version_name = 'Where No One Has Gone Before' EOF ''; diff --git a/pkgs/development/interpreters/renpy/renpy-system-fribidi.diff b/pkgs/development/interpreters/renpy/renpy-system-fribidi.diff deleted file mode 100644 index 8c93b75a7b0f..000000000000 --- a/pkgs/development/interpreters/renpy/renpy-system-fribidi.diff +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/module/renpybidicore.c b/module/renpybidicore.c -index 849430d..d883a52 100644 ---- a/module/renpybidicore.c -+++ b/module/renpybidicore.c -@@ -1,10 +1,6 @@ - #include - --#ifdef RENPY_BUILD - #include --#else --#include --#endif - - #include - -diff --git a/module/setup.py b/module/setup.py -index bd16816..f6b8794 100755 ---- a/module/setup.py -+++ b/module/setup.py -@@ -118,29 +118,17 @@ cython( - sdl + [ png, 'z', 'm' ]) - - FRIBIDI_SOURCES = """ --fribidi-src/lib/fribidi.c --fribidi-src/lib/fribidi-arabic.c --fribidi-src/lib/fribidi-bidi.c --fribidi-src/lib/fribidi-bidi-types.c --fribidi-src/lib/fribidi-deprecated.c --fribidi-src/lib/fribidi-joining.c --fribidi-src/lib/fribidi-joining-types.c --fribidi-src/lib/fribidi-mem.c --fribidi-src/lib/fribidi-mirroring.c --fribidi-src/lib/fribidi-run.c --fribidi-src/lib/fribidi-shape.c - renpybidicore.c - """.split() - cython( - "_renpybidi", - FRIBIDI_SOURCES, -+ ["fribidi"], - includes=[ -- BASE + "/fribidi-src/", -- BASE + "/fribidi-src/lib/", -+ "@fribidi@/include/fribidi/", - ], - define_macros=[ - ("FRIBIDI_ENTRY", ""), -- ("HAVE_CONFIG_H", "1"), - ]) - - if not (android or ios or emscripten): diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index 44d86c7b5f97..f9bc0ebb9083 100644 --- a/pkgs/development/libraries/cglm/default.nix +++ b/pkgs/development/libraries/cglm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cglm"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; rev = "v${version}"; - sha256 = "sha256-V6qX6f1pETjDHVu+VJXRDcKKiCBYuQnh8Bz48HRyRR8="; + sha256 = "sha256-qOPOJ+h1bq5yKkP3ZNeZnRwiOMSgS7bxTk7s/5tREQw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/kirigami-addons/default.nix b/pkgs/development/libraries/kirigami-addons/default.nix index 481d5e1e2a79..881b49364ee5 100644 --- a/pkgs/development/libraries/kirigami-addons/default.nix +++ b/pkgs/development/libraries/kirigami-addons/default.nix @@ -12,14 +12,14 @@ mkDerivation rec { pname = "kirigami-addons"; - version = "0.8.0"; + version = "0.10.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - hash = "sha256-ObbpM1gVVFhOIHOla5YS8YYe+JoPgdZ8kJ356wLTJq4="; + hash = "sha256-wwc0PCY8vNCmmwfIYYQhQea9AYkHakvTaERtazz8npQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index 385b5707754f..33126eeb60d6 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizip-ng"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "zlib-ng"; repo = finalAttrs.pname; rev = finalAttrs.version; - sha256 = "sha256-YgBOsznV1JtnpLUJeqZ06zvdB3tNbOlFhhLd1pMJhEM="; + sha256 = "sha256-3bCGZupdJWcwp2d+XeqKZG3GxzXFm1UftV/PiN0u5iA="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/development/libraries/pico-sdk/default.nix index 12b4cb021c1f..cd860c3629f0 100644 --- a/pkgs/development/libraries/pico-sdk/default.nix +++ b/pkgs/development/libraries/pico-sdk/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/raspberrypi/picotool"; + homepage = "https://github.com/raspberrypi/pico-sdk"; description = "SDK provides the headers, libraries and build system necessary to write programs for the RP2040-based devices"; license = licenses.bsd3; maintainers = with maintainers; [ muscaln ]; diff --git a/pkgs/development/libraries/tagparser/default.nix b/pkgs/development/libraries/tagparser/default.nix index f20d5a39ea37..7f534979c978 100644 --- a/pkgs/development/libraries/tagparser/default.nix +++ b/pkgs/development/libraries/tagparser/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "tagparser"; - version = "11.6.0"; + version = "12.0.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "tagparser"; rev = "v${version}"; - hash = "sha256-zi1n5Mdto8DmUq5DWxcr4f+DX6Sq/JsK8uzRzj5f0/E="; + hash = "sha256-b6nAVhakQA8oKHP48+1S+4SX6EcI0kxK8uXTZ05cLnQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix index c7ff41cebb37..43ec9da28834 100644 --- a/pkgs/development/ocaml-modules/odoc/default.nix +++ b/pkgs/development/ocaml-modules/odoc/default.nix @@ -6,15 +6,13 @@ buildDunePackage rec { pname = "odoc"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { url = "https://github.com/ocaml/odoc/releases/download/${version}/odoc-${version}.tbz"; - sha256 = "sha256-aBjJcfwMPu2dPRQzifgHObFhivcLn9tEOzW9fwEhdAw="; + sha256 = "sha256-F4blO/CCT+HHx7gdKn2EaEal0RZ3lp5jljYfd6OBaAM="; }; - duneVersion = "3"; - nativeBuildInputs = [ cppo ]; buildInputs = [ astring cmdliner fpath result tyxml odoc-parser fmt ]; @@ -35,5 +33,6 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; homepage = "https://github.com/ocaml/odoc"; + changelog = "https://github.com/ocaml/odoc/blob/${version}/CHANGES.md"; }; } diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 67e841ae1b31..329dd01f02ea 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -10,15 +10,15 @@ buildDunePackage rec { pname = "ssl"; - version = "0.5.13"; + version = "0.7.0"; duneVersion = "3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ssl"; - rev = version; - sha256 = "sha256-Ws7QZOvZVy0QixMiBFJZEOnYzYlCWrZ1d95gOp/a5a0="; + rev = "v${version}"; + hash = "sha256-gi80iwlKaI4TdAVnCyPG03qRWFa19DHdTrA0KMFBAc4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix index c01b42c64b83..24e3194d80c0 100644 --- a/pkgs/development/python-modules/cheetah3/default.nix +++ b/pkgs/development/python-modules/cheetah3/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "cheetah3"; - version = "3.3.1"; + version = "3.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "CheetahTemplate3"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-op8CwYISD2Gfsh0Olr8H07yvaT1maKyizb/IN9ZHwmQ="; + hash = "sha256-okQz1wM3k43okKcZDRgHAnn5ScL0Pe1OtUvDBScEamY="; }; doCheck = false; # Circular dependency diff --git a/pkgs/development/python-modules/class-doc/default.nix b/pkgs/development/python-modules/class-doc/default.nix index 937a94c953b8..432df1f674ee 100644 --- a/pkgs/development/python-modules/class-doc/default.nix +++ b/pkgs/development/python-modules/class-doc/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , more-itertools , pytestCheckHook @@ -13,21 +14,24 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "danields761"; - repo = "${pname}"; + repo = pname; rev = "9b122d85ce667d096ebee75a49350bbdbd48686d"; # no 0.2.6 version tag hash = "sha256-4Sn/TuBvBpl1nvJBg327+sVrjGavkYKEYP32DwLWako="; }; + patches = [ + # https://github.com/danields761/class-doc/pull/2 + (fetchpatch { + name = "poetry-to-poetry-core.patch"; + url = "https://github.com/danields761/class-doc/commit/03b224ad0a6190c30e4932fa2ccd4a7f0c5c4b5d.patch"; + hash = "sha256-shWPRaZkvtJ1Ae17aCOm6eLs905jxwq84SWOrChEs7M="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; - postPatch = '' - substituteInPlace pyproject.toml --replace \ - "poetry.masonry.api" \ - "poetry.core.masonry.api" - ''; - propagatedBuildInputs = [ more-itertools ]; diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 656447e2ef4c..e5de149fca14 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -17,13 +17,13 @@ let inherit (cudaPackages) cudatoolkit cudnn cutensor nccl; in buildPythonPackage rec { pname = "cupy"; - version = "12.1.0"; + version = "12.2.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9tMZic2y2WWB2hKCLiixAvKeJUQnGVwgF+rDJ4abcyA="; + hash = "sha256-+V/9Cv6sthewSP4Cjt4HuX3J6VrKFhCgIrHz0gqaAn4="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index 9f54b9b9ede5..c57e2911daf8 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "3.8.1"; + version = "4.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jazzband"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GlEw25wem8iwwm3rYLk6TFEAIzC1pYjpSHdAkHwtFcE="; + hash = "sha256-UgnWA2JicL6xsnIF5WaWCRIdXEJbwiE89tqiueczEfE="; }; nativeBuildInputs = [ @@ -59,5 +59,5 @@ buildPythonPackage rec { changelog = "https://django-debug-toolbar.readthedocs.io/en/latest/changes.html"; license = licenses.bsd3; maintainers = with maintainers; [ yuu ]; -}; + }; } diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 51275aafc4c4..181692d4fe22 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.16.1"; + version = "0.16.2"; format = "pyproject"; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "v${version}"; - hash = "sha256-iVNie2VFyqzDdXtgnbZDzeIXsDEm6ugjIPJexLwHqeI="; + hash = "sha256-JL9znvXl+RIEzycKhXkggEJ87bQ+UzspBD1YM3AoYlc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 5fdc44912319..cd6f4060fc96 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -1,6 +1,9 @@ { lib +, stdenv +, buildPackages , buildPythonPackage , fetchFromGitHub +, installShellFiles , ruamel-yaml , xmltodict , pygments @@ -22,6 +25,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' + installShellCompletion --cmd jc \ + --bash <(${emulator} $out/bin/jc --bash-comp) \ + --zsh <(${emulator} $out/bin/jc --zsh-comp) + ''; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "jc" ]; diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 35febbffc632..8276af406b14 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2023.5.27"; + version = "2023.8.10"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-HqNBXDmPU0vh1cA0swWK708MnCcAEeiRxf/yaW2Oh/U="; + hash = "sha256-3AHc7Ej0IJ2WCQ8XVbWL0lwTQW6ng2ehemTcmJOQ86U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 97a7aed915e1..8584930c31f1 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -43,6 +43,8 @@ buildPythonPackage rec { nativeBuildInputs = [ mpi ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ openssh ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 2623f5c376a6..0528aeaec52b 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -125,6 +125,7 @@ buildPythonPackage rec { description = "Optional static typing for Python"; homepage = "https://www.mypy-lang.org"; license = licenses.mit; + mainProgram = "mypy"; maintainers = with maintainers; [ martingms lnl7 ]; }; } diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 444b66549af6..96ae8df32df0 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyaml"; - version = "21.10.1"; + version = "23.7.0"; src = fetchPypi { inherit pname version; - sha256 = "c6519fee13bf06e3bb3f20cacdea8eba9140385a7c2546df5dbae4887f768383"; + sha256 = "sha256-DFELu4k4MJQA4LHkesFv2Q5W1lKAWpNBcSh4ZxjzNUY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index 318683f04815..bf123eef02a5 100644 --- a/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz"; - hash = "sha256-smJsOVavMvy0aO3C5PC050LlOy5bsG45uWSMbbFMQ+I="; + hash = "sha256-u9DIFKd+uyphH3ETMJWYqt7YFyeIgBWoXUO3rC+RWjc="; }; # force rebuild of headers needed for install diff --git a/pkgs/development/python-modules/pypiserver/default.nix b/pkgs/development/python-modules/pypiserver/default.nix index 74ddf37e236d..e892a8227c3d 100644 --- a/pkgs/development/python-modules/pypiserver/default.nix +++ b/pkgs/development/python-modules/pypiserver/default.nix @@ -1,57 +1,82 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib , passlib , pytestCheckHook +, pythonOlder , setuptools , setuptools-git , twine +, watchdog , webtest }: buildPythonPackage rec { pname = "pypiserver"; - version = "1.5.1"; + version = "1.5.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - hash = "sha256-1tV3pVEC5sIjT0tjbujU7l41Jx7PQ1dCn4B1r94C9xE="; + rev = "refs/tags/v${version}"; + hash = "sha256-jub+iVL/YeGaG9Vzqyyfc4qFi0cR+7xrzuXNHL5W4p4="; }; - nativeBuildInputs = [ setuptools-git ]; + nativeBuildInputs = [ + setuptools-git + ]; - propagatedBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ + setuptools + ]; + + passthru.optional-dependencies = { + passlib = [ + passlib + ]; + cache = [ + watchdog + ]; + }; preCheck = '' export HOME=$TMPDIR ''; nativeCheckInputs = [ - passlib pytestCheckHook twine webtest - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTests = [ - # fails to install the package + # Fails to install the package "test_hash_algos" "test_pip_install_authed_succeeds" "test_pip_install_open_succeeds" + "test_pip_install_authed_fails" + # Tests want to tests upload + "upload" + "register" + "test_partial_authed_open_download" ]; disabledTestPaths = [ - # requires docker service running + # Test requires docker service running "docker/test_docker.py" ]; - pythonImportsCheck = [ "pypiserver" ]; + pythonImportsCheck = [ + "pypiserver" + ]; meta = with lib; { - homepage = "https://github.com/pypiserver/pypiserver"; description = "Minimal PyPI server for use with pip/easy_install"; + homepage = "https://github.com/pypiserver/pypiserver"; + changelog = "https://github.com/pypiserver/pypiserver/releases/tag/v${version}"; license = with licenses; [ mit zlib ]; maintainers = with maintainers; [ austinbutler ]; }; diff --git a/pkgs/development/python-modules/pytest-examples/default.nix b/pkgs/development/python-modules/pytest-examples/default.nix index 37e7c2fe6bfe..212938df20b6 100644 --- a/pkgs/development/python-modules/pytest-examples/default.nix +++ b/pkgs/development/python-modules/pytest-examples/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytest-examples"; - version = "0.0.9"; + version = "0.0.10"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pydantic"; repo = "pytest-examples"; rev = "refs/tags/v${version}"; - hash = "sha256-ecxSLbPnHdL60vlc7EjKmw5rATTePqJCa5QIdyxevv0="; + hash = "sha256-jCxOGDJlFkMH9VtaaPsE5zt+p3Z/mrVzhdNSI51/nVM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/riprova/default.nix b/pkgs/development/python-modules/riprova/default.nix index adf327208955..c4a0ee950704 100644 --- a/pkgs/development/python-modules/riprova/default.nix +++ b/pkgs/development/python-modules/riprova/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec{ pname = "riprova"; - version = "0.2.7"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "04drdvjjbh370csv2vb5zamg2aanxqkfm6w361qkybnra4g4g0dz"; + sha256 = "sha256-FgFySbvBjcZU2bjo40/1O7glc6oFWW05jinEOfMWMVI="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/tools/database/dblab/default.nix b/pkgs/development/tools/database/dblab/default.nix index 0dea7530e426..cc4f6a9cfd8e 100644 --- a/pkgs/development/tools/database/dblab/default.nix +++ b/pkgs/development/tools/database/dblab/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dblab"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "danvergara"; repo = "dblab"; rev = "v${version}"; - hash = "sha256-Wg7BujAf7pTek+WPiVONRof5rYfKixXkU+OS/04m3zY="; + hash = "sha256-3Bmus2yVTwvy0CpoNE1mzVvocpBnRoI11Sf+x2JXhgM="; }; vendorHash = "sha256-vf0CeiLBVqMGV2oqxRHzhvL7SoT9zcg8P5c63z3UR3g="; diff --git a/pkgs/development/tools/detekt/default.nix b/pkgs/development/tools/detekt/default.nix index 599c10e0b7b6..27e11032d939 100644 --- a/pkgs/development/tools/detekt/default.nix +++ b/pkgs/development/tools/detekt/default.nix @@ -1,13 +1,13 @@ { detekt, lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }: stdenv.mkDerivation rec { pname = "detekt"; - version = "1.23.0"; + version = "1.23.1"; jarfilename = "${pname}-${version}-executable.jar"; src = fetchurl { url = "https://github.com/detekt/detekt/releases/download/v${version}/detekt-cli-${version}-all.jar"; - sha256 = "sha256-XmmcyfwWZAE9PQa6TP2HZsn7iADwMUBdxMad8jYWH9o="; + sha256 = "sha256-CJwVQF7FVjrbooXQnOzP8Efrx4iLi7w6OGu8bGdE14g="; }; dontUnpack = true; diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index d57549dd7e30..06983c3e286c 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.7.11"; + version = "0.7.15"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-iIMTDdWO//H8BXEbYMx15vo48IQ15AJjNvMg8Y2oFUY="; + sha256 = "sha256-cCN63eHfYAsCcvRU+hAH+dZJHlmBu7MitvrjGB/qzMU="; }; - vendorHash = "sha256-tEhUywjJtNaWLPSRNeHTcNsPNCZtXzqjg0VG4g4N9E0="; + vendorHash = "sha256-8t7nWVItX9OPo6fsJuzo+w6ZyVcsqwi2e7HE2nqyYck="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; diff --git a/pkgs/development/tools/github-copilot-intellij-agent/default.nix b/pkgs/development/tools/github-copilot-intellij-agent/default.nix index a1f2bc950198..128095d671cb 100644 --- a/pkgs/development/tools/github-copilot-intellij-agent/default.nix +++ b/pkgs/development/tools/github-copilot-intellij-agent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "github-copilot-intellij-agent"; - version = "1.2.8.2631"; + version = "1.2.18.2908"; src = fetchurl { name = "${pname}-${version}-plugin.zip"; - url = "https://plugins.jetbrains.com/plugin/download?updateId=341846"; - hash = "sha256-0nnSMdx9Vb2WyNHreOJMP15K1+AII/kCEAOiFK5Mhik="; + url = "https://plugins.jetbrains.com/plugin/download?updateId=373346"; + hash = "sha256-ErSj4ckPSaEkOeGTRS27yFKDlj2iZfoPdjbZleSIL1s="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index 215e7fcfe688..fd92a8035839 100644 --- a/pkgs/development/tools/go-mockery/default.nix +++ b/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.32.0"; + version = "2.32.4"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-fQzXgCRMIcGQRCnKn/vu3GzNrx4/xrMVmzqjOujyNNE="; + sha256 = "sha256-8J8SEPsRj6T6kpCTaouHEojLJQD4K0894m5ldVGdy6I="; }; preCheck = '' diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index a39c8e9f5014..986d2d7745f3 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -43,14 +43,14 @@ let in stdenv.mkDerivation rec { pname = "godot"; - version = "4.1-stable"; - commitHash = "970459615f6b2b4151742ec6d7ef8559f87fd5c5"; + version = "4.1.1"; + commitHash = "bd6af8e0ea69167dd0627f3bd54f9105bda0f8b5"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = commitHash; - hash = "sha256-v9qKrPYQz4c+xkSu/2ru7ZE5EzKVyXhmrxyHZQkng2U="; + hash = "sha256-0CErsMTrBC/zYcabAtjYn8BWAZ1HxgozKdgiqdsn3q8="; }; nativeBuildInputs = [ @@ -148,5 +148,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ twey shiryel ]; + mainProgram = "godot4"; }; } diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index ef2cdafea325..6f62f7d86c92 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "5.1.0"; + version = "5.1.1"; ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in [ @@ -15,7 +15,7 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - hash = "sha256-nYndDoaCMyIvMlhHawgcv8WCCa3HYgAcF+3QxyYxub4="; + hash = "sha256-XtpMws2o3h19PsRJXKg+y5/Zk3bc6mJ4O1LLZ40ioTM="; }; # avoid finding test and development commands diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 8a83d0566465..18007e302a0d 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dEmwVgo9XiU3WtObVL5VbFW7rEzdFfnRepcbyGxX1JM="; + hash = "sha256-4W6quVSkxS2I6KEy3fVyBTypD0fg4EecgeEVM0Yw58s="; }; nativeBuildInputs = [ @@ -34,14 +34,6 @@ stdenv.mkDerivation rec { mimalloc ]; - patches = [ - ./fix-debug-strip.patch # fix --debug-strip; https://github.com/rui314/mold/pull/1038 - ]; - - postPatch = '' - sed -i CMakeLists.txt -e '/.*set(DEST\ .*/d' - ''; - cmakeFlags = [ "-DMOLD_USE_SYSTEM_MIMALLOC:BOOL=ON" ]; @@ -66,7 +58,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rui314/mold"; changelog = "https://github.com/rui314/mold/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ azahi nitsky ]; + maintainers = with maintainers; [ azahi nitsky paveloom ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/mold/fix-debug-strip.patch b/pkgs/development/tools/mold/fix-debug-strip.patch deleted file mode 100644 index 78906efc73ac..000000000000 --- a/pkgs/development/tools/mold/fix-debug-strip.patch +++ /dev/null @@ -1,23 +0,0 @@ -From b699b73451c57ac01c2680c0b86e1f56ca19e51c Mon Sep 17 00:00:00 2001 -From: Jakub Konka -Date: Sat, 6 May 2023 07:55:46 +0200 -Subject: [PATCH] Fix handling of --debug-strip - -Signed-off-by: Jakub Konka ---- - elf/cmdline.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/elf/cmdline.cc b/elf/cmdline.cc -index 3ac19f237..731af63ab 100644 ---- a/elf/cmdline.cc -+++ b/elf/cmdline.cc -@@ -994,7 +994,7 @@ std::vector parse_nonpositional_args(Context &ctx) { - } else if (read_flag("strip-all") || read_flag("s")) { - ctx.arg.strip_all = true; - } else if (read_flag("strip-debug") || read_flag("S")) { -- ctx.arg.strip_all = true; -+ ctx.arg.strip_debug = true; - } else if (read_flag("warn-unresolved-symbols")) { - ctx.arg.unresolved_symbols = UNRESOLVED_WARN; - } else if (read_flag("error-unresolved-symbols")) { diff --git a/pkgs/development/tools/parsing/re-flex/default.nix b/pkgs/development/tools/parsing/re-flex/default.nix index 6f19a488649d..0dd520eb9e3f 100644 --- a/pkgs/development/tools/parsing/re-flex/default.nix +++ b/pkgs/development/tools/parsing/re-flex/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "re-flex"; - version = "3.3.7"; + version = "3.3.8"; src = fetchFromGitHub { owner = "Genivia"; repo = "RE-flex"; rev = "v${version}"; - sha256 = "sha256-YLWMVsfmb1cSYWtxCkTkANYRiUenkNZ7n2QFEI6SU1A="; + sha256 = "sha256-ujBdR4NDY9TwHwghtj2uMJoLtuYpzw5cUCMSbEsXlmY="; }; nativeBuildInputs = [ boost autoconf automake ]; diff --git a/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/pkgs/development/tools/protoc-gen-twirp_php/default.nix index 1fb1dbfbf791..30b2ff3ce78d 100644 --- a/pkgs/development/tools/protoc-gen-twirp_php/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp_php/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-twirp_php"; - version = "0.9.1"; + version = "0.10.0"; # fetchFromGitHub currently not possible, because go.mod and go.sum are export-ignored src = fetchgit { url = "https://github.com/twirphp/twirp.git"; rev = "v${version}"; - sha256 = "sha256-6tA+iNcs6s4vviWSJ5gCL9hPyCa7OvYXRCCokAAO0T8="; + sha256 = "sha256-YMndB5DiER2Z1ARbw2cpxE1DBFCoVNWhMdsfA3X27EE="; }; - vendorSha256 = "sha256-Kz9tMM4XSMOUmlHb/BE5/C/ZohdE505DTeDj9lGki/I="; + vendorHash = "sha256-Gf8thGuFAKX4pCNFJM3RbJ63vciLNcSqpOULcUOaGNw="; subPackages = [ "protoc-gen-twirp_php" ]; diff --git a/pkgs/development/tools/relic/default.nix b/pkgs/development/tools/relic/default.nix index cd9b56c51dc4..c2dc1873394a 100644 --- a/pkgs/development/tools/relic/default.nix +++ b/pkgs/development/tools/relic/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "relic"; - version = "7.5.6"; + version = "7.5.9"; src = fetchFromGitHub { owner = "sassoftware"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dg5+vA8AtTglPgfTqz8dRZEt7I6uPs579+4rcmeN/34="; + sha256 = "sha256-x+F/sXZAnGbzMCXKY05VSYM0o0ujf/aWUP/nrUo+FSs="; }; vendorHash = "sha256-EZohpGzMDYKUbjSOIfoUbbsABNDOddrTt52pv+VQLdI="; diff --git a/pkgs/development/tools/rust/cargo-bolero/default.nix b/pkgs/development/tools/rust/cargo-bolero/default.nix index 37f22bb925ce..15a3a28183a0 100644 --- a/pkgs/development/tools/rust/cargo-bolero/default.nix +++ b/pkgs/development/tools/rust/cargo-bolero/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bolero"; - version = "0.8.0"; + version = "0.9.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-j6fWCIXfVS5b3NZizhg9pI+kJkWlR1eGUSW9hJO1/mQ="; + sha256 = "sha256-BuqbM55P/st+4XUSCwrqILUUCfwvSlxhKQFO+IZLa8U="; }; - cargoSha256 = "sha256-ycvGw99CcE29axG9UWD0lkQp5kxD6Eguco5Fh9Vfj6E="; + cargoSha256 = "sha256-+TxMOKoId13meXqmr1QjDZMNqBnPEDQF1VSPheq8Ji0="; buildInputs = [ libbfd libopcodes libunwind ]; diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/development/tools/zed/default.nix index 98e7f37e5c19..8619e3617388 100644 --- a/pkgs/development/tools/zed/default.nix +++ b/pkgs/development/tools/zed/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "zed"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "brimdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3YLQi/9YTUDyprlSjzCACffF6eXwLbmfsU/LPhEriqA="; + sha256 = "sha256-aLehlxMztOqtItzouWESQs5K2EZ+O8EAwUQT9v7GX08="; }; vendorHash = "sha256-n/7HV3dyV8qsJeEk+vikZvuM5G7nf0QOwVBtInJdU2k="; diff --git a/pkgs/games/fteqw/default.nix b/pkgs/games/fteqw/default.nix index 984c558180fe..c4129d3974d6 100644 --- a/pkgs/games/fteqw/default.nix +++ b/pkgs/games/fteqw/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchsvn +, fetchFromGitHub , gzip , libvorbis , libmad diff --git a/pkgs/games/fteqw/generic.nix b/pkgs/games/fteqw/generic.nix index a420657ea578..a525cf5a6c44 100644 --- a/pkgs/games/fteqw/generic.nix +++ b/pkgs/games/fteqw/generic.nix @@ -1,5 +1,5 @@ { lib -, fetchsvn +, fetchFromGitHub , stdenv , libopus , xorg @@ -14,12 +14,13 @@ stdenv.mkDerivation { inherit pname buildFlags buildInputs nativeBuildInputs postFixup; - version = "unstable-2022-08-09"; + version = "unstable-2023-08-03"; - src = fetchsvn { - url = "https://svn.code.sf.net/p/fteqw/code/trunk"; - rev = "6303"; - sha256 = "sha256-tSTFX59iVUvndPRdREayKpkQ+YCYKCMQe2PXZfnTgPQ="; + src = fetchFromGitHub { + owner = "fte-team"; + repo = "fteqw"; + rev = "3adec5d0a53ba9ae32a92fc0a805cf6d5ec107fb"; + hash = "sha256-p/U02hwKI+YqlVXIS/7+gujknNDLr5L53unjvG5qLJU="; }; makeFlags = [ @@ -45,7 +46,7 @@ stdenv.mkDerivation { meta = with lib; { inherit description; - homepage = "https://fte.triptohell.info"; + homepage = "https://fteqw.org"; longDescription = '' FTE is a game engine baed on QuakeWorld able to play games such as Quake 1, 2, 3, and Hexen 2. diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index e0cf519acccb..d5a884a01381 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.7.11"; + version = "4.7.13"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-1QMfGONaw6XX3F2bo5tBghJbnii7z6RE+ZuanIGUF8Q="; + hash = "sha256-KvRDPu2FZY+iZ2vNi/tly/7/Tpg/EN8jHTKizYV5jeY="; }; dontUnpack = true; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 2c2f21022a77..3eb05f25936f 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -67,13 +67,13 @@ with lib; stdenv.mkDerivation rec { pname = "conky"; - version = "1.19.2"; + version = "1.19.3"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - hash = "sha256-AKU2kHYwhSmNrqZQWLmY82U+WQiuYiZKCJC5c0jG3KQ="; + hash = "sha256-Wt1g7/2PebpyxvIBihDBsl3DvM1EeRyOhD5ntlk0Oh0="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 454a72739b3d..6112b65eabd9 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -117,6 +117,7 @@ stdenv.mkDerivation { description = "Settings application for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = nvidia_x11.meta.platforms; + mainProgram = "nvidia-settings"; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/os-specific/linux/opensnitch-ebpf/default.nix b/pkgs/os-specific/linux/opensnitch-ebpf/default.nix new file mode 100644 index 000000000000..70332abbe6ef --- /dev/null +++ b/pkgs/os-specific/linux/opensnitch-ebpf/default.nix @@ -0,0 +1,58 @@ +{ lib +, kernel +, stdenv +, clang-tools +, llvmPackages +, elfutils +, flex +, bison +, bc +, opensnitch +}: + +stdenv.mkDerivation rec { + pname = "opensnitch_ebpf"; + version = "${opensnitch.version}-${kernel.version}"; + + inherit (opensnitch) src; + + sourceRoot = "source/ebpf_prog"; + + nativeBuildInputs = with llvmPackages; [ + bc + bison + clang + clang-tools + elfutils + flex + libllvm + ]; + + # We set -fno-stack-protector here to work around a clang regression. + # This is fine - bpf programs do not use stack protectors + # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=opensnitch-ebpf-module&id=984b952a784eb701f691dd9f2d45dfeb8d15053b + env.NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + + env.KERNEL_DIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"; + env.KERNEL_HEADERS="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + + extraConfig ='' + CONFIG_UPROBE_EVENTS=y + ''; + + installPhase = '' + runHook preInstall + for file in opensnitch*.o; do + install -Dm644 "$file" "$out/etc/opensnitchd/$file" + done + runHook postInstall + ''; + + meta = with lib; { + description = "eBPF process monitor module for OpenSnitch"; + homepage = "https://github.com/evilsocket/opensnitch"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ onny ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 6f145137567a..1e94991b5c08 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.16.0"; + version = "1.16.1"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - hash = "sha256-7F0kutAWyi22OxI242P8m1Aoj+l/7F91wmxDSt4ttyA="; + hash = "sha256-EEreAhxBQm6Wj1JFGfC9Ql3NARPXNOhqZkzIDJ2NMkg="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorHash = "sha256-aZRW+z9oW7if+yMOrETNXFC521Wo0feq1FDv8/Q4ejY="; + vendorHash = "sha256-zERHmtmGrPrUPJ2fFc+J0pWKLKQc9TTSFkN2RUOXOoM="; doCheck = false; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 36fce8a205b4..5393188ccd6f 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.584"; + version = "0.21.635"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-uv8r39iH1Te7WqmJK/qDbXE46qjUNEFi1YPgSyHRegLZWGjP7QAAn4x5WBTXZ1OLlsbVRg3fJkj/BanHLBuqjg=="; + hash = "sha512-KhQUuRJUqnCOLbwhTJiWOHj/yGsdne9TY9qyuE6c7y0gvAdKPE9Xkolt0RV/pjQtr6Hnbw5MaXahHHDOrhkN5Q=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/moonraker/default.nix b/pkgs/servers/moonraker/default.nix index 73595e6909ce..ed2e988d8a66 100644 --- a/pkgs/servers/moonraker/default.nix +++ b/pkgs/servers/moonraker/default.nix @@ -20,13 +20,13 @@ let ]); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "unstable-2022-11-18"; + version = "unstable-2023-08-03"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "362bc1a3d3ad397416f7fc48b8efe33837428b90"; - sha256 = "sha256-cebRHOx2hg470jM1CoQAk13Whv+KN2qx97BTlpjxSZg="; + rev = "fe120952ee06607d039af8f461028e9f5b817395"; + sha256 = "sha256-TyhpMHu06YoaV5tZGBcYulUrABW6OFYZLyCoZLRmaUU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nosql/influxdb2/cli.nix b/pkgs/servers/nosql/influxdb2/cli.nix index ee60a8c46f4f..dc7395a7eb7f 100644 --- a/pkgs/servers/nosql/influxdb2/cli.nix +++ b/pkgs/servers/nosql/influxdb2/cli.nix @@ -29,5 +29,6 @@ in buildGoModule { license = licenses.mit; homepage = "https://influxdata.com/"; maintainers = with maintainers; [ abbradar danderson ]; + mainProgram = "influx"; }; } diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/servers/web-apps/nifi/default.nix index 4b66484f7b27..7074fdbe4e8c 100644 --- a/pkgs/servers/web-apps/nifi/default.nix +++ b/pkgs/servers/web-apps/nifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nifi"; - version = "1.22.0"; + version = "1.23.0"; src = fetchzip { url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip"; - hash = "sha256-IzTGsD6nL7UrXuHrJc8Dt1C6r137UjT/V4vES2m/8cg="; + hash = "sha256-IWmekIrWGvVTOX2MG+3EkX4phWzdrhxH5vNWpsrsrvM="; }; nativeBuildInputs = [ makeWrapper ]; @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; homepage = "https://nifi.apache.org"; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ izorkin ]; }; } diff --git a/pkgs/shells/zsh/antidote/default.nix b/pkgs/shells/zsh/antidote/default.nix index 598c72fa132d..a1bb818f6d8f 100644 --- a/pkgs/shells/zsh/antidote/default.nix +++ b/pkgs/shells/zsh/antidote/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation (finalAttrs: { - version = "1.9.0"; + version = "1.9.1"; pname = "antidote"; src = fetchFromGitHub { owner = "mattmc3"; repo = "antidote"; rev = "v${finalAttrs.version}"; - hash = "sha256-YKFG66Kjw/S0YkvPlJK3HC9v00SHEW1Wng6+xcy41Hg="; + hash = "sha256-wRLMjaBpzttQ6MUgl1AFC2SRlEEwjASdEnguGlP+XgU="; }; dontPatch = true; diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/shells/zsh/zimfw/default.nix index 3714f0ee364e..5f58d3d5e9f9 100644 --- a/pkgs/shells/zsh/zimfw/default.nix +++ b/pkgs/shells/zsh/zimfw/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "zimfw"; - version = "1.11.3"; + version = "1.12.0"; src = fetchFromGitHub { owner = "zimfw"; repo = "zimfw"; rev = "v${version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; - sha256 = "sha256-q3OSypjqAc+ul0kF6f3u+wnFyNEm4AKwyPBwQzlVzYU="; + sha256 = "sha256-PwfPiga4KcOrkkObIu3RCUmO2ExoDQkbQx7S+Yncy6k="; }; strictDeps = true; dontConfigure = true; diff --git a/pkgs/tools/admin/aws-sso-cli/default.nix b/pkgs/tools/admin/aws-sso-cli/default.nix index 558891d31656..6ff97aa78d8c 100644 --- a/pkgs/tools/admin/aws-sso-cli/default.nix +++ b/pkgs/tools/admin/aws-sso-cli/default.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "aws-sso-cli"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "synfinatic"; repo = pname; rev = "v${version}"; - hash = "sha256-Kcjg2xzW8l/3RViJri1UpG36YkmbHbXIKkDQnVr/26g="; + hash = "sha256-Vem0RMKkCwgqs06Ly3Awz4EcCWLd0H4xjWGRbnAlqbE="; }; vendorHash = "sha256-myjHRZXTjsLXD8kibcdf1/Nhvx50fDsFtmZd63DpiiI="; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index fa18015c8ff5..130cdb769934 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -24,14 +24,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.13.5"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.13.7"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-gtzRHNEReCKzGDdiwS5kngcJYp5oAHmhnOPl/uTyxvU="; + hash = "sha256-SQ9ggHSpQioptic5qjrhCB63t9pld7KGAeCNtq4OJyQ="; }; patches = [ diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index d176b32d60cf..4c808acd003e 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "upx"; - version = "4.0.2"; + version = "4.1.0"; src = fetchFromGitHub { owner = "upx"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-5jqEdMlHmsD88kT/EGieL7DktppVdfWyJWGRNRKbRc4="; + sha256 = "sha256-pHJypO+sK7+ytM7yJxJpfBJHTYpGc9nr/JiFGd7hlJM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix index 71a268de7d65..f0253c8b6613 100644 --- a/pkgs/tools/graphics/grim/default.nix +++ b/pkgs/tools/graphics/grim/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "~emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5csJqRLNqhyeXR4dEQtnPUSwuZ8oY+BIt6AVICkm1+o="; + hash = "sha256-5csJqRLNqhyeXR4dEQtnPUSwuZ8oY+BIt6AVICkm1+o="; }; mesonFlags = [ @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/emersion/grim"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ buffet ]; + maintainers = with maintainers; [ buffet eclairevoyant ]; + mainProgram = "grim"; }; } diff --git a/pkgs/tools/misc/easeprobe/default.nix b/pkgs/tools/misc/easeprobe/default.nix index a46b3c613809..9745364fb7ec 100644 --- a/pkgs/tools/misc/easeprobe/default.nix +++ b/pkgs/tools/misc/easeprobe/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "easeprobe"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "megaease"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z+qwmVsznzm6TjvDOT1/8Zy3wUDPFDrjcpxXXHnb4oo="; + sha256 = "sha256-vdbzDwFpCYVgH9T8e62+1hnMyWsWrT7e6WPaAlBc2H0="; }; - vendorHash = "sha256-N32uSuHAbTfGg+Y1bmngzw4RTx5gR4DGKbSBB0BT+8I="; + vendorHash = "sha256-ZB6q8XvDVSF5/kx2Avq0PYBkYqSoMD6YHhuXRrotFgk="; subPackages = [ "cmd/easeprobe" ]; diff --git a/pkgs/tools/misc/eza/default.nix b/pkgs/tools/misc/eza/default.nix index c1fa9ad4a1ca..715eee9c05d0 100644 --- a/pkgs/tools/misc/eza/default.nix +++ b/pkgs/tools/misc/eza/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.10.6"; + version = "0.10.7"; src = fetchFromGitHub { - owner = "cafkafk"; + owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-+MA9p15RGPaQ7Drhiljeb7KqThQnXMymjXFFS5sLxdM="; + hash = "sha256-f8js+zToP61lgmxucz2gyh3uRZeZSnoxS4vuqLNVO7c="; }; - cargoHash = "sha256-aplwr9X9MLhKrF5125gMtmuI/72RGf+1GZqkBYyxUSQ="; + cargoHash = "sha256-G3zNv8pG9uS12PsBug51RaS9Hx0sGHHnVEF4bHb+v18="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] @@ -37,7 +37,8 @@ rustPlatform.buildRustPackage rec { postInstall = '' pandoc --standalone -f markdown -t man man/eza.1.md > man/eza.1 pandoc --standalone -f markdown -t man man/eza_colors.5.md > man/eza_colors.5 - installManPage man/eza.1 man/eza_colors.5 + pandoc --standalone -f markdown -t man man/eza_colors-explanation.5.md > man/eza_colors-explanation.5 + installManPage man/eza.1 man/eza_colors.5 man/eza_colors-explanation.5 installShellCompletion \ --bash completions/bash/eza \ --fish completions/fish/eza.fish \ @@ -54,7 +55,7 @@ rustPlatform.buildRustPackage rec { for a directory, or recursing into directories with a tree view. eza is written in Rust, so it’s small, fast, and portable. ''; - homepage = "https://github.com/cafkafk/eza"; + homepage = "https://github.com/eza-community/eza"; license = licenses.mit; maintainers = with maintainers; [ cafkafk ]; }; diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix index e2a5483e54fd..cfa7ad4f47ba 100644 --- a/pkgs/tools/misc/jfrog-cli/default.nix +++ b/pkgs/tools/misc/jfrog-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.43.1"; + version = "2.45.0"; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-Ad3kcx5F6U6ucamhhD0c5st86nrJxCPX9e62u7yjPYI="; + hash = "sha256-NSkSE1NZIwCCSlCo7hGWq82JvH48uI8fV2RIZHwS5JI="; }; - vendorHash = "sha256-iLjm8k0XbYcA05J52K8mGWleiMhSRjzzkTOrQ28UdVw="; + vendorHash = "sha256-fk+Lhmb+LgjSuGlDfHkentF10TOgqIxbZ1VVGmAmkME="; postInstall = '' # Name the output the same way as the original build script does diff --git a/pkgs/tools/misc/nurl/default.nix b/pkgs/tools/misc/nurl/default.nix index 16fec1445a57..e0af2ff638dd 100644 --- a/pkgs/tools/misc/nurl/default.nix +++ b/pkgs/tools/misc/nurl/default.nix @@ -7,7 +7,7 @@ , darwin , gitMinimal , mercurial -, nixVersions +, nix }: rustPlatform.buildRustPackage rec { @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/nurl \ - --prefix PATH : ${lib.makeBinPath [ gitMinimal mercurial nixVersions.unstable ]} + --prefix PATH : ${lib.makeBinPath [ gitMinimal mercurial nix ]} installManPage artifacts/nurl.1 installShellCompletion artifacts/nurl.{bash,fish} --zsh artifacts/_nurl ''; diff --git a/pkgs/tools/misc/wayshot/default.nix b/pkgs/tools/misc/wayshot/default.nix index d5732385bb1d..82b7631f5bed 100644 --- a/pkgs/tools/misc/wayshot/default.nix +++ b/pkgs/tools/misc/wayshot/default.nix @@ -19,5 +19,6 @@ rustPlatform.buildRustPackage rec { license = licenses.bsd2; maintainers = [ maintainers.dit7ya ]; platforms = platforms.linux; + mainProgram = "wayshot"; }; } diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/tools/networking/dae/default.nix index 9c874f860d27..666340d1fbe2 100644 --- a/pkgs/tools/networking/dae/default.nix +++ b/pkgs/tools/networking/dae/default.nix @@ -9,17 +9,17 @@ }: buildGoModule rec { pname = "dae"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "daeuniverse"; repo = "dae"; rev = "v${version}"; - hash = "sha256-Fk3xpQ8xuZMPulMFZb5fnN0Tisk13XRx49vBN5coanQ="; + hash = "sha256-MVmx37q5nbgaUehPJ2C2UjVyx48/U/vA3NeBx6Zcmg8="; fetchSubmodules = true; }; - vendorHash = "sha256-sqcImm5BYTiUnBmcpWWMR1TuV877VE5gZ8Oth8AxjSg="; + vendorHash = "sha256-oeMAekLWRJzmkmge4LmrVSFRzHZ/dStX+CvLtuYOsog="; proxyVendor = true; diff --git a/pkgs/tools/networking/juicity/default.nix b/pkgs/tools/networking/juicity/default.nix index 4c3c1bb012f6..53e12094fa7a 100644 --- a/pkgs/tools/networking/juicity/default.nix +++ b/pkgs/tools/networking/juicity/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "juicity"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "juicity"; repo = pname; rev = "v${version}"; - hash = "sha256-k6rx55AxdUWEdnqsTj0Xq9gafx0TCdziNcf61nz//Z8="; + hash = "sha256-aTg2Xo2+3uxLTJ3MRC46FR/4qBs28IpT6K3KMb8i16s="; }; - vendorHash = "sha256-cUbN5/MHawzzQZgrdnt28yRtPClTdIUJZm1GjcWf0dI="; + vendorHash = "sha256-xTpT3Qjg2kAJynLaQLLMmoL/SzpguK2YrlWsq/NYrX4="; proxyVendor = true; diff --git a/pkgs/tools/networking/opensnitch/daemon.nix b/pkgs/tools/networking/opensnitch/daemon.nix index 36c8739781df..86bc8a604142 100644 --- a/pkgs/tools/networking/opensnitch/daemon.nix +++ b/pkgs/tools/networking/opensnitch/daemon.nix @@ -56,10 +56,8 @@ buildGoModule rec { mv $GOPATH/bin/daemon $GOPATH/bin/opensnitchd mkdir -p $out/etc/opensnitchd $out/lib/systemd/system cp system-fw.json $out/etc/opensnitchd/ - substitute default-config.json $out/etc/default-config.json \ - --replace "/var/log/opensnitchd.log" "/dev/stdout" \ - --replace "iptables" "nftables" \ - --replace "ebpf" "proc" + substitute default-config.json $out/etc/opensnitchd/default-config.json \ + --replace "/var/log/opensnitchd.log" "/dev/stdout" substitute opensnitchd.service $out/lib/systemd/system/opensnitchd.service \ --replace "/usr/local/bin/opensnitchd" "$out/bin/opensnitchd" \ --replace "/etc/opensnitchd/rules" "/var/lib/opensnitch/rules" \ diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index cef63629b01f..7eaa8c24c524 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SVfBWOaDh2wE0XwoUzXOFohjHcb5upWILdWuUW0dwr8="; + sha256 = "sha256-KyceWyVIgIPx4zw7pUCY2IC9PfbSYzwoDEbw80VhI+s="; }; - vendorHash = "sha256-2Ob2oU7XBnqiWiR3td/lXDWl863ihx7j3iwP2CUGG/U="; + vendorHash = "sha256-vvgXlVPQPH6hO4yA3HYB0C6mva9eI2zMIlBhjtZXOTI="; modRoot = "./v2"; @@ -31,6 +31,6 @@ buildGoModule rec { ''; homepage = "https://github.com/projectdiscovery/subfinder"; license = licenses.mit; - maintainers = with maintainers; [ fpletz Br1ght0ne ]; + maintainers = with maintainers; [ fpletz Br1ght0ne Misaka13514 ]; }; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ef383788d1f9..1482931bf4dc 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -208,9 +208,9 @@ in lib.makeExtensible (self: ({ else nix; - stable = self.nix_2_15; + stable = self.nix_2_17; - unstable = self.nix_2_17; + unstable = self.stable; } // lib.optionalAttrs config.allowAliases { nix_2_4 = throw "nixVersions.nix_2_4 has been removed"; diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/tools/security/enpass/data.json index d967b2266ae1..dc6ef2049723 100644 --- a/pkgs/tools/security/enpass/data.json +++ b/pkgs/tools/security/enpass/data.json @@ -1,8 +1,8 @@ { "amd64": { - "path": "pool/main/e/enpass/enpass_6.8.5.1173_amd64.deb", - "sha256": "5855e617041d73682320f3643eb4136c93eef2beaf3be9d37cbadfc76d719b5b", - "version": "6.8.5.1173" + "path": "pool/main/e/enpass/enpass_6.9.0.1467_amd64.deb", + "sha256": "fe405f7119d45822164da3ad009b99c5cd516685198c1d335b7803d84e5ba2ca", + "version": "6.9.0.1467" }, "i386": { "path": "pool/main/e/enpass/enpass_5.6.9_i386.deb", diff --git a/pkgs/tools/security/enpass/update_script.py b/pkgs/tools/security/enpass/update_script.py old mode 100644 new mode 100755 index f8ec715cb5e4..ab0b6ce3f48e --- a/pkgs/tools/security/enpass/update_script.py +++ b/pkgs/tools/security/enpass/update_script.py @@ -1,95 +1,74 @@ -from __future__ import print_function - - -import argparse -import bz2 -import email +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p python3 python3.pkgs.packaging python3.pkgs.requests +import gzip import json import logging +import pathlib +import re +import subprocess +import sys -from itertools import product -from operator import itemgetter +from packaging import version +import requests -import attr -import pkg_resources +logging.basicConfig(stream=sys.stdout, level=logging.DEBUG) -from pathlib2 import Path -from requests import Session -from six.moves.urllib_parse import urljoin +current_path = pathlib.Path(__file__).parent +DATA_JSON = current_path.joinpath("data.json").resolve() +logging.debug(f"Path to version file: {DATA_JSON}") +last_new_version = None + +with open(DATA_JSON, "r") as versions_file: + versions = json.load(versions_file) + +def find_latest_version(arch): + CHECK_URL = f'https://apt.enpass.io/dists/stable/main/binary-{arch}/Packages.gz' + packages = gzip.decompress(requests.get(CHECK_URL).content).decode() + + # Loop every package to find the newest one! + version_selector = re.compile("Version: (?P.+)") + path_selector = re.compile("Filename: (?P.+)") + hash_selector = re.compile("SHA256: (?P.+)") + last_version = version.parse("0") + for package in packages.split("\n\n"): + matches = version_selector.search(package) + matched_version = matches.group('version') if matches and matches.group('version') else "0" + parsed_version = version.parse(matched_version) + if parsed_version > last_version: + path = path_selector.search(package).group('path') + sha256 = hash_selector.search(package).group('sha256') + last_version = parsed_version + return {"path": path, "sha256": sha256, "version": matched_version} + +for arch in versions.keys(): + current_version = versions[arch]['version'] + logging.info(f"Current Version for {arch} is {current_version}") + new_version = find_latest_version(arch) + + if not new_version or new_version['version'] == current_version: + continue + + last_current_version = current_version + last_new_version = new_version + logging.info(f"Update found ({arch}): enpass: {current_version} -> {new_version['version']}") + versions[arch]['path'] = new_version['path'] + versions[arch]['sha256'] = new_version['sha256'] + versions[arch]['version'] = new_version['version'] -@attr.s -class ReleaseElement(object): - sha256 = attr.ib(repr=False) - size = attr.ib(convert=int) - path = attr.ib() +if not last_new_version: + logging.info('#### No update found ####') + sys.exit(0) -log = logging.getLogger('enpass.updater') +# write new versions back +with open(DATA_JSON, "w") as versions_file: + json.dump(versions, versions_file, indent=2) + versions_file.write("\n") +# Commit the result: +logging.info("Committing changes...") +commit_message = f"enpass: {last_current_version} -> {last_new_version['version']}" +subprocess.run(['git', 'add', DATA_JSON], check=True) +subprocess.run(['git', 'commit', '--file=-'], input=commit_message.encode(), check=True) -parser = argparse.ArgumentParser() -parser.add_argument('--repo') -parser.add_argument('--target', type=Path) - - -session = Session() - - -def parse_bz2_msg(msg): - msg = bz2.decompress(msg) - if '\n\n' in msg: - parts = msg.split('\n\n') - return list(map(email.message_from_string, parts)) - return email.message_from_string(msg) - - -def fetch_meta(repo, name, parse=email.message_from_string, split=False): - url = urljoin(repo, 'dists/stable', name) - response = session.get("{repo}/dists/stable/{name}".format(**locals())) - return parse(response.content) - - -def fetch_filehashes(repo, path): - meta = fetch_meta(repo, path, parse=parse_bz2_msg) - for item in meta: - yield { - 'version': pkg_resources.parse_version(str(item['Version'])), - 'path': item['Filename'], - 'sha256': item['sha256'], - } - - -def fetch_archs(repo): - m = fetch_meta(repo, 'Release') - - architectures = m['Architectures'].split() - elements = [ReleaseElement(*x.split()) for x in m['SHA256'].splitlines()] - elements = [x for x in elements if x.path.endswith('bz2')] - - for arch, elem in product(architectures, elements): - if arch in elem.path: - yield arch, max(fetch_filehashes(repo, elem.path), - key=itemgetter('version')) - - -class OurVersionEncoder(json.JSONEncoder): - def default(self, obj): - # the other way around to avoid issues with - # newer setuptools having strict/legacy versions - if not isinstance(obj, (dict, str)): - return str(obj) - return json.JSONEncoder.default(self, obj) - - -def main(repo, target): - logging.basicConfig(level=logging.DEBUG) - with target.open(mode='wb') as fp: - json.dump( - dict(fetch_archs(repo)), fp, - cls=OurVersionEncoder, - indent=2, - sort_keys=True) - - -opts = parser.parse_args() -main(opts.repo, opts.target) +logging.info("Done.") diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index 5ddc121f9d65..f32f933dbbaa 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - hash = "sha256-jpUDNtcJBcxlHt4GEVZLGT11QBgLHgOR3Y2TT7GROls="; + hash = "sha256-78RYFFpsW6onWd1aAxDf28GUblIGVtg0uZeURZPla8E="; }; - vendorHash = "sha256-DV+sZkTKsTygO/LOi6z0vSUgavyqYKB4F2fMxuFFdvw="; + vendorHash = "sha256-LRH3wMRSHIpavXSupFA9HLojBqWVObQfL+SM8ah4oBg="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here diff --git a/pkgs/tools/text/igrep/default.nix b/pkgs/tools/text/igrep/default.nix index 1e17cda75d5f..34f9202cfa05 100644 --- a/pkgs/tools/text/igrep/default.nix +++ b/pkgs/tools/text/igrep/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "igrep"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "konradsz"; repo = "igrep"; rev = "v${version}"; - sha256 = "sha256-g6DY3+HwBNQ+jxByXyTJK5CjAaC48FpmsDf1qGGO/Lk="; + sha256 = "sha256-L5mHuglU0CvTi02pbR8xfezBoH8L/DS+7jgvYvb4yro="; }; - cargoHash = "sha256-7cSUIwWyWPxFDuRWplidbI93zbBV84T7e4Q//Uwj6N4="; + cargoHash = "sha256-k63tu5Ffus4z0yd8vQ79q4+tokWAXD05Pvv9JByfnDg="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 580a578731c5..04273984e81d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -460,6 +460,7 @@ mapAliases ({ emacs28NativeComp = emacs28; # Added 2022-06-08 emacs28Packages = emacs28.pkgs; # Added 2021-10-04 emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04 + emacsMacport = emacs-macport; # Added 2023-08-10 emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 emacsPackagesNg = emacs.pkgs; # Added 2019-08-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f636a5ae622..4b316379e8dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1776,6 +1776,8 @@ with pkgs; fabs = callPackage ../tools/backup/fabs { }; + fm = callPackage ../applications/file-managers/fm { }; + fm-tune = callPackage ../applications/radio/fm-tune { }; fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { }; @@ -18342,7 +18344,9 @@ with pkgs; pylyzer = callPackage ../development/tools/language-servers/pylyzer { }; - rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp { }; + rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp { + nix = nixVersions.nix_2_15; + }; ruff-lsp = python3Packages.callPackage ../development/tools/language-servers/ruff-lsp { }; @@ -31166,10 +31170,11 @@ with pkgs; emacs29-gtk3 emacs29-nox emacs29-pgtk - emacs-macport + emacs28-macport + emacs29-macport ; - emacsMacport = emacs-macport; + emacs-macport = emacs28-macport; emacs = emacs28; emacs-gtk = emacs28-gtk3; emacs-nox = emacs28-nox; @@ -40454,7 +40459,9 @@ with pkgs; nix-melt = callPackage ../tools/nix/nix-melt { }; - nixos-option = callPackage ../tools/nix/nixos-option { }; + nixos-option = callPackage ../tools/nix/nixos-option { + nix = nixVersions.nix_2_15; + }; nix-pin = callPackage ../tools/package-management/nix-pin { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index c813e7d6e0fb..c68f0345f112 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -450,6 +450,8 @@ in { # Current stable release; don't backport release updates! openafs = openafs_1_8; + opensnitch-ebpf = if lib.versionAtLeast kernel.version "5.10" then callPackage ../os-specific/linux/opensnitch-ebpf { } else null; + facetimehd = callPackage ../os-specific/linux/facetimehd { }; tuxedo-keyboard = if lib.versionAtLeast kernel.version "4.14" then callPackage ../os-specific/linux/tuxedo-keyboard { } else null; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 62a3e6e586af..aff0e71fcca1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9953,10 +9953,10 @@ with self; { FinanceQuote = buildPerlPackage rec { pname = "Finance-Quote"; - version = "1.57"; + version = "1.58"; src = fetchurl { url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz"; - hash = "sha256-dm7dUw+RRp+MGiU6nVs4jX167PTMiihFL0SHASOTQs4="; + hash = "sha256-jN3qDTgJo2aVzuaaKGK+qs1hU1f+uv23JkGnerRna4A="; }; buildInputs = [ DateManip DateRange DateSimple DateTime DateTimeFormatISO8601 StringUtil TestKwalitee TestPerlCritic TestPod TestPodCoverage ]; propagatedBuildInputs = [ DateManip DateTimeFormatStrptime Encode HTMLTableExtract HTMLTokeParserSimple HTMLTree HTMLTreeBuilderXPath HTTPCookies JSON IOCompress IOString LWPProtocolHttps Readonly StringUtil SpreadsheetXLSX TextTemplate TryTiny WebScraper XMLLibXML libwwwperl ];