Merge staging-next into staging

authored by

github-actions[bot] and committed by
GitHub
bcf52f93 bbf2d405

+342 -187
+1 -1
maintainers/scripts/copy-tarballs.pl
··· 1 1 #! /usr/bin/env nix-shell 2 - #! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp perlPackages.JSON perlPackages.LWPProtocolHttps nixUnstable nixUnstable.perl-bindings 2 + #! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp perlPackages.JSON perlPackages.LWPProtocolHttps nix nix.perl-bindings 3 3 4 4 # This command uploads tarballs to tarballs.nixos.org, the 5 5 # content-addressed cache used by fetchurl as a fallback for when
+2 -1
nixos/modules/programs/wayland/hyprland.nix
··· 56 56 services.displayManager.sessionPackages = [ cfg.package ]; 57 57 58 58 xdg.portal = { 59 + enable = true; 59 60 extraPortals = [ cfg.portalPackage ]; 60 61 configPackages = lib.mkDefault [ cfg.package ]; 61 62 }; ··· 70 71 (import ./wayland-session.nix { 71 72 inherit lib pkgs; 72 73 enableXWayland = cfg.xwayland.enable; 73 - enableWlrPortal = false; # Hyprland has its own portal, wlr is not needed 74 + enableWlrPortal = lib.mkDefault false; # Hyprland has its own portal, wlr is not needed 74 75 }) 75 76 ]); 76 77
+3 -3
pkgs/applications/blockchains/optimism/default.nix
··· 6 6 7 7 buildGoModule rec { 8 8 pname = "optimism"; 9 - version = "1.7.6"; 9 + version = "1.7.7"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "ethereum-optimism"; 13 13 repo = "optimism"; 14 14 rev = "op-node/v${version}"; 15 - hash = "sha256-LpkmNJqPe73qbTNvqxlDDTh9hD/H39ll3Rn2NEFEcg8="; 15 + hash = "sha256-KN6Y8YhYGNGg/t4t599RAo6mF7Wn7GaSnrLEk3WLekc="; 16 16 fetchSubmodules = true; 17 17 }; 18 18 19 19 subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ]; 20 20 21 - vendorHash = "sha256-2eVwGWw/z6ct3PA8fC0rBwkNaICd20llVE/9essF95Q="; 21 + vendorHash = "sha256-MWGjRj5SMFi3O86l3Gc/oavzWd1TtoKr53eEXbCOamQ="; 22 22 23 23 buildInputs = [ 24 24 libpcap
+2 -2
pkgs/applications/blockchains/wasabiwallet/default.nix
··· 25 25 in 26 26 stdenv.mkDerivation rec { 27 27 pname = "wasabiwallet"; 28 - version = "2.0.8"; 28 + version = "2.0.8.1"; 29 29 30 30 src = fetchurl { 31 31 url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; 32 - sha256 = "sha256-9iNaEvTHvmE4DEh/5jHEOJuTnr2yAZSRR/L/v0ZUZDk="; 32 + sha256 = "sha256-9q93C8Q4MKrpvAs6cb4sgo3PDVhk9ZExeHIZ9Qm8P2w="; 33 33 }; 34 34 35 35 dontBuild = true;
+2 -2
pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/default.nix
··· 5 5 version = "1.11"; 6 6 7 7 src = fetchurl { 8 - url = "http://bigwalter.net/daniel/elisp/sv-kalender.el"; 8 + url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/ec4fa36bdba5d2c5c4f5e0400a70768c10e969e8/sv-kalender.el"; 9 9 sha256 = "0mcx7g1pg6kfp0i4b9rh3q9csgdf3054ijswy368bxwdxsjgfz2m"; 10 10 }; 11 11 12 12 meta = with lib; { 13 13 description = "Swedish calendar for Emacs"; 14 - homepage = "http://bigwalter.net/daniel/elisp/sv-kalender.el"; 14 + homepage = "https://www.emacswiki.org/emacs/sv-kalender.el"; 15 15 platforms = platforms.all; 16 16 license = licenses.gpl3Plus; 17 17 maintainers = [ maintainers.rycee ];
+13
pkgs/applications/editors/vim/plugins/generated.nix
··· 17469 17469 }; 17470 17470 17471 17471 17472 + git-prompt-string-lualine-nvim = buildVimPlugin { 17473 + pname = "git-prompt-string-lualine-nvim"; 17474 + version = "2024-04-22"; 17475 + src = fetchFromGitHub { 17476 + owner = "mikesmithgh"; 17477 + repo = "git-prompt-string-lualine.nvim"; 17478 + rev = "5426ce15462abe4faf5cd76db7476b2686120fe9"; 17479 + sha256 = "sha256-BM1AEpIcOd5nr4N/ZoxK9NodiUbUuY9hw7n/wRTXzzk="; 17480 + }; 17481 + meta.homepage = "https://github.com/mikesmithgh/git-prompt-string-lualine.nvim"; 17482 + }; 17483 + 17484 + 17472 17485 }
+1
pkgs/applications/editors/vim/plugins/vim-plugin-names
··· 347 347 https://github.com/f-person/git-blame.nvim/,, 348 348 https://github.com/akinsho/git-conflict.nvim/,HEAD, 349 349 https://github.com/rhysd/git-messenger.vim/,, 350 + https://github.com/mikesmithgh/git-prompt-string-lualine.nvim/,HEAD, 350 351 https://github.com/ThePrimeagen/git-worktree.nvim/,, 351 352 https://github.com/wintermute-cell/gitignore.nvim/,HEAD, 352 353 https://github.com/vim-scripts/gitignore.vim/,,
+2 -2
pkgs/applications/graphics/apitrace/default.nix
··· 17 17 18 18 stdenv.mkDerivation rec { 19 19 pname = "apitrace"; 20 - version = "11.1"; 20 + version = "12.0"; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "apitrace"; 24 24 repo = "apitrace"; 25 25 rev = version; 26 - hash = "sha256-rvC6iVWNNxH11hzQvRTo+SQi9jEUCPWGSdJmKJe9SQ0="; 26 + hash = "sha256-Y2ceE0F7q5tP64Mtvkc7JHOZQN30MDVCPHfiWDnfTSQ="; 27 27 fetchSubmodules = true; 28 28 }; 29 29
+2 -2
pkgs/applications/networking/cluster/werf/default.nix
··· 10 10 11 11 buildGoModule rec { 12 12 pname = "werf"; 13 - version = "2.4.1"; 13 + version = "2.5.0"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "werf"; 17 17 repo = "werf"; 18 18 rev = "v${version}"; 19 - hash = "sha256-kHNjdwAIGJi1/ryEioRwZIYm4UziT2Ig1y2PgnbA0ZE="; 19 + hash = "sha256-dZwZzBisQUmOz1lij6L0NHigXW2DtUd6s86sHYq8UPA="; 20 20 }; 21 21 22 22 vendorHash = "sha256-cWOnIEvVer+USqNQJmhZ7pYSJfzY2xjq2oTxRd/y94w=";
+3 -3
pkgs/applications/networking/syncthing/default.nix
··· 13 13 common = { stname, target, postInstall ? "" }: 14 14 buildGoModule rec { 15 15 pname = stname; 16 - version = "1.27.7"; 16 + version = "1.27.8"; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "syncthing"; 20 20 repo = "syncthing"; 21 21 rev = "v${version}"; 22 - hash = "sha256-Y/gwQfb3ShOsXsNLomtqUlmYaw7FQQ6IUN1fHSYOouQ="; 22 + hash = "sha256-+uyN/x/nFB/YAOvIqO1IIs3UH+yn/eKMBW1Ap9PvhRM="; 23 23 }; 24 24 25 - vendorHash = "sha256-xVSSFFTqU7jww8YTeXKfa3096c2FmEgkcXvuqFHb12E="; 25 + vendorHash = "sha256-fzNpdriCRr4M3oW8IaImnGEN4G9AQwLZNFHg00zbIs0="; 26 26 27 27 nativeBuildInputs = lib.optionals stdenv.isDarwin [ 28 28 # Recent versions of macOS seem to require binaries to be signed when
-8
pkgs/applications/office/paperwork/paperwork-backend.nix
··· 1 1 { buildPythonPackage 2 2 , lib 3 3 , fetchFromGitLab 4 - , fetchpatch 5 4 , pyenchant 6 5 , scikit-learn 7 6 , pypillowfight ··· 34 33 sourceRoot = "${src.name}/paperwork-backend"; 35 34 36 35 patches = [ 37 - # fixes building with recent scipy 38 - # remove on next release 39 - (fetchpatch { 40 - url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/abcebfe9714644d4e259e53b10e0e9417b5b864f.patch"; 41 - hash = "sha256-YjVpphThW5Livs+PZJZDSgJvhLSXhZ1bnlWMwfY4HTg="; 42 - }) 43 - 44 36 # disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700 45 37 ./flaky_test.patch 46 38 ];
+2 -2
pkgs/applications/office/paperwork/src.nix
··· 1 1 {fetchFromGitLab}: 2 2 rec { 3 - version = "2.2.2"; 3 + version = "2.2.3"; 4 4 src = fetchFromGitLab { 5 5 domain = "gitlab.gnome.org"; 6 6 repo = "paperwork"; 7 7 group = "World"; 8 8 owner = "OpenPaperwork"; 9 9 rev = version; 10 - sha256 = "sha256-fVw+W10yEPLf6IUyaDpnmu7tPOqbvNLE8IK8mjHvurQ="; 10 + sha256 = "sha256-xQN1IUbTQEHtyW5F8Zbg2EUN5K87oYqnSdzo0gEeOfI="; 11 11 }; 12 12 sample_documents = fetchFromGitLab { 13 13 domain = "gitlab.gnome.org";
+5 -2
pkgs/by-name/ad/ad-miner/package.nix
··· 18 18 # All requirements are pinned 19 19 pythonRelaxDeps = true; 20 20 21 + build-system = with python3.pkgs; [ 22 + poetry-core 23 + ]; 24 + 21 25 nativeBuildInputs = with python3.pkgs; [ 22 - poetry-core 23 26 pythonRelaxDepsHook 24 27 ]; 25 28 26 - propagatedBuildInputs = with python3.pkgs; [ 29 + dependencies = with python3.pkgs; [ 27 30 neo4j 28 31 numpy 29 32 pytz
+40
pkgs/by-name/br/breads-ad/package.nix
··· 1 + { 2 + lib, 3 + python3, 4 + fetchFromGitHub, 5 + }: 6 + 7 + python3.pkgs.buildPythonApplication rec { 8 + pname = "breads-ad"; 9 + version = "1.2.4-unstable-2024-05-27"; 10 + pyproject = true; 11 + 12 + src = fetchFromGitHub { 13 + owner = "oppsec"; 14 + repo = "breads"; 15 + rev = "bdfc8b5f0357a34847767505ddc98734ca3b491f"; 16 + hash = "sha256-U1q15D59N55qBf4NVOpe5RpQjlE1ye2TNNIZf2IZV3U="; 17 + }; 18 + 19 + build-system = with python3.pkgs; [ 20 + setuptools 21 + ]; 22 + 23 + dependencies = with python3.pkgs; [ 24 + impacket 25 + ldap3 26 + rich 27 + ]; 28 + 29 + # Project has no tests 30 + doCheck = false; 31 + 32 + meta = with lib; { 33 + description = "Tool to evaluate Active Directory Security"; 34 + homepage = "https://github.com/oppsec/breads"; 35 + changelog = "https://github.com/oppsec/breads/blob/${version}/CHANGELOG.md"; 36 + license = licenses.mit; 37 + maintainers = with maintainers; [ fab ]; 38 + mainProgram = "breads-ad"; 39 + }; 40 + }
+2 -2
pkgs/by-name/cd/cdecl/package.nix
··· 11 11 12 12 stdenv.mkDerivation (finalAttrs: { 13 13 pname = "cdecl"; 14 - version = "16.4.1"; 14 + version = "17.0"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "paul-j-lucas"; 18 18 repo = "cdecl"; 19 19 rev = "refs/tags/cdecl-${finalAttrs.version}"; 20 - hash = "sha256-QAU/wTVBcSgIuY+fdZUaWGBNGuAvu/xyXuzQUtmn510="; 20 + hash = "sha256-ElMmsFD4VXF6BFjFuuWmgFJaqCPCxpQB7S9tLkeGmMY="; 21 21 }; 22 22 23 23 strictDeps = true;
+5 -5
pkgs/by-name/co/codeium/package.nix
··· 13 13 }.${system} or throwSystem; 14 14 15 15 hash = { 16 - x86_64-linux = "sha256-7GOWEvCco8/CxdWmvRsXfMOOSPsfb1/UQpbFEEeQfUc="; 17 - aarch64-linux = "sha256-j+gILUP681hMo0azcbeZwi3Q9dwd9v6ADWow720cWAo="; 18 - x86_64-darwin = "sha256-RNDDzAwf5s2EMTrum1OF6iZ/SUF7cG0Ow2itb0ynaJk="; 19 - aarch64-darwin = "sha256-ac8j5BFEylAe7ApN3+iYW5ldFUh/7UYWf3MlDNOQTvc="; 16 + x86_64-linux = "sha256-38ESKfQXHqHdP+vu/ynCByIPYHcvt8w8SJ/NTmCpm8o="; 17 + aarch64-linux = "sha256-W00MyiBPQa8vClIjDynDgYEeigjWtBuDfNzZKMEzifg="; 18 + x86_64-darwin = "sha256-CkKuEuYfq/vUv8uc4mhKpjqAfGM/B8goJ5EPAsA1gnI="; 19 + aarch64-darwin = "sha256-aX70EfrRzEz2DJIcSEXrd0T0ptHzie21CQx4g6dU7g0="; 20 20 }.${system} or throwSystem; 21 21 22 22 bin = "$out/bin/codeium_language_server"; ··· 24 24 in 25 25 stdenv.mkDerivation (finalAttrs: { 26 26 pname = "codeium"; 27 - version = "1.8.57"; 27 + version = "1.8.61"; 28 28 src = fetchurl { 29 29 name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; 30 30 url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";
+42
pkgs/by-name/co/conpass/package.nix
··· 1 + { 2 + lib, 3 + python3, 4 + fetchFromGitHub, 5 + }: 6 + 7 + python3.pkgs.buildPythonApplication rec { 8 + pname = "conpass"; 9 + version = "0.1.2"; 10 + pyproject = true; 11 + 12 + src = fetchFromGitHub { 13 + owner = "login-securite"; 14 + repo = "conpass"; 15 + rev = "refs/tags/v${version}"; 16 + hash = "sha256-7o4aQ6qpaWimWqgFO35Wht7mQsdVezoPTm7hp54FWR8="; 17 + }; 18 + 19 + build-system = with python3.pkgs; [ 20 + setuptools 21 + ]; 22 + 23 + dependencies = with python3.pkgs; [ 24 + impacket 25 + python-ldap 26 + rich 27 + ]; 28 + 29 + # Project has no tests 30 + doCheck = false; 31 + 32 + pythonImportsCheck = [ "conpass" ]; 33 + 34 + meta = with lib; { 35 + description = "Continuous password spraying tool"; 36 + homepage = "https://github.com/login-securite/conpass"; 37 + changelog = "https://github.com/login-securite/conpass/releases/tag/v${version}"; 38 + license = licenses.mit; 39 + maintainers = with maintainers; [ fab ]; 40 + mainProgram = "conpass"; 41 + }; 42 + }
-5
pkgs/by-name/ga/gamescope/package.nix
··· 24 24 , openvr 25 25 , stb 26 26 , wlroots 27 - , libliftoff 28 27 , libdecor 29 28 , libdisplay-info 30 29 , lib ··· 55 54 }; 56 55 57 56 patches = [ 58 - # Unvendor dependencies 59 - ./use-pkgconfig.patch 60 - 61 57 # Make it look for shaders in the right place 62 58 ./shaders-path.patch 63 59 ]; ··· 116 112 libavif 117 113 libdrm 118 114 libei 119 - libliftoff 120 115 SDL2 121 116 libdecor 122 117 libinput
-9
pkgs/by-name/ga/gamescope/use-pkgconfig.patch
··· 1 - --- a/meson.build 2 - +++ b/meson.build 3 - @@ -6,7 +6,6 @@ project( 4 - default_options: [ 5 - 'cpp_std=c++20', 6 - 'warning_level=2', 7 - - 'force_fallback_for=wlroots,libliftoff,vkroots', 8 - ], 9 - )
+33
pkgs/by-name/go/go-secdump/package.nix
··· 1 + { 2 + lib, 3 + buildGoModule, 4 + fetchFromGitHub, 5 + }: 6 + 7 + buildGoModule rec { 8 + pname = "go-secdump"; 9 + version = "0.2.1"; 10 + 11 + src = fetchFromGitHub { 12 + owner = "jfjallid"; 13 + repo = "go-secdump"; 14 + rev = "refs/tags/${version}"; 15 + hash = "sha256-mb44v79BH9wW8+b1Le0lyVtl5iHIEzGvgVzaf0zEG20="; 16 + }; 17 + 18 + vendorHash = "sha256-xgvT+RnaTzkVql7js/Mb5vZM5BV+B3OJbCTfDWDmt7c="; 19 + 20 + ldflags = [ 21 + "-s" 22 + "-w" 23 + ]; 24 + 25 + meta = with lib; { 26 + description = "Tool to remotely dump secrets from the Windows registry"; 27 + homepage = "https://github.com/jfjallid/go-secdump"; 28 + changelog = "https://github.com/jfjallid/go-secdump/releases/tag/${version}"; 29 + license = licenses.mit; 30 + maintainers = with maintainers; [ fab ]; 31 + mainProgram = "go-secdump"; 32 + }; 33 + }
+2 -2
pkgs/by-name/ol/ollama/package.nix
··· 31 31 let 32 32 pname = "ollama"; 33 33 # don't forget to invalidate all hashes each update 34 - version = "0.1.43"; 34 + version = "0.1.44"; 35 35 36 36 src = fetchFromGitHub { 37 37 owner = "ollama"; 38 38 repo = "ollama"; 39 39 rev = "v${version}"; 40 - hash = "sha256-+WCyRZPm4EyLH68uXDUJEW76v6FXq2WS5fqt4momKDA="; 40 + hash = "sha256-HM7xtVdhRwhsLEBLvCgjU1iwdaqowRdrxh/Z0BzTPn8="; 41 41 fetchSubmodules = true; 42 42 }; 43 43
+1 -1
pkgs/by-name/pl/plasticity/update.sh
··· 5 5 set -eu -o pipefail 6 6 7 7 version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ 8 - curl -s https://api.github.com/repos/nkallen/plasticity/releases/latest | jq -e -r ".tag_name | .[1:]") 8 + https://api.github.com/repos/nkallen/plasticity/releases/latest | jq -e -r ".tag_name | .[1:]") 9 9 old_version=$(nix-instantiate --eval -A plasticity.version | jq -e -r) 10 10 11 11 if [[ $version == "$old_version" ]]; then
+45
pkgs/by-name/sp/sploitscan/package.nix
··· 1 + { lib 2 + , python3 3 + , fetchFromGitHub 4 + }: 5 + 6 + python3.pkgs.buildPythonApplication rec { 7 + pname = "sploitscan"; 8 + version = "0.9.1"; 9 + pyproject = true; 10 + 11 + src = fetchFromGitHub { 12 + owner = "xaitax"; 13 + repo = "SploitScan"; 14 + rev = "refs/tags/v${version}"; 15 + hash = "sha256-l2nLqQoM5TuOezobipBV+s/nXTw37xhop/xpipLL1Bs="; 16 + }; 17 + 18 + pythonRelaxDeps = [ 19 + "openai" 20 + "requests" 21 + ]; 22 + 23 + build-system = with python3.pkgs; [ 24 + setuptools 25 + ]; 26 + 27 + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; 28 + 29 + dependencies = with python3.pkgs; [ 30 + jinja2 31 + openai 32 + requests 33 + ]; 34 + 35 + pythonImportsCheck = [ "sploitscan" ]; 36 + 37 + meta = with lib; { 38 + description = "Cybersecurity utility designed to provide detailed information on vulnerabilities and associated exploits"; 39 + homepage = "https://github.com/xaitax/SploitScan"; 40 + changelog = "https://github.com/xaitax/SploitScan/releases/tag/v${version}"; 41 + license = licenses.gpl3Only; 42 + maintainers = with maintainers; [ fab ]; 43 + mainProgram = "sploitscan"; 44 + }; 45 + }
+3 -3
pkgs/by-name/st/step-cli/package.nix
··· 3 3 buildGoModule, 4 4 fetchFromGitHub, 5 5 }: let 6 - version = "0.26.1"; 6 + version = "0.26.2"; 7 7 in 8 8 buildGoModule { 9 9 pname = "step-cli"; ··· 13 13 owner = "smallstep"; 14 14 repo = "cli"; 15 15 rev = "refs/tags/v${version}"; 16 - hash = "sha256-BVxdgyQsfCwHw/zjP3AKNib3sRWoBpMlZ7vh71nso94="; 16 + hash = "sha256-CrV6kWgq2ldeOh5G0SgO8+q0HC1l8RuTELT3YXLxClU="; 17 17 }; 18 18 19 19 ldflags = [ ··· 27 27 rm command/certificate/remote_test.go 28 28 ''; 29 29 30 - vendorHash = "sha256-Z6wrWkyAGi01gH7+v2+VkyqRNqDwLFVwXm/1FIMzURg="; 30 + vendorHash = "sha256-pqwrjreysMLfVmzPE7Tj/hLdM1HO13UfmbMXvNgLd5Y="; 31 31 32 32 meta = { 33 33 description = "Zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";
+4 -4
pkgs/by-name/wa/warp-terminal/versions.json
··· 1 1 { 2 2 "darwin": { 3 - "hash": "sha256-PWcsgYnq8dCyAPJPPWeWXi1HpEgpKBt8OS4VH7XcLFM=", 4 - "version": "0.2024.06.04.08.02.stable_02" 3 + "hash": "sha256-fUGCbOQXT22VGFpnmLxDLfEaNOk7hJq4BF1PU54swYg=", 4 + "version": "0.2024.06.11.08.02.stable_01" 5 5 }, 6 6 "linux": { 7 - "hash": "sha256-65H9SVcsco282MA//URP6gBuFjDc3R5elL2oZ0ae4W4=", 8 - "version": "0.2024.06.04.08.02.stable_02" 7 + "hash": "sha256-5Ge6tNA4UnRfDhY7ki/3SIX3egkyWye9hHWEhObv/I8=", 8 + "version": "0.2024.06.11.08.02.stable_01" 9 9 } 10 10 }
+43 -42
pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
··· 31 31 32 32 lib.checkListOfEnum "where-is-my-sddm-theme: variant" validVariants variants 33 33 34 - stdenvNoCC.mkDerivation rec { 35 - pname = "where-is-my-sddm-theme"; 36 - version = "1.9.1"; 34 + stdenvNoCC.mkDerivation 35 + (finalAttrs: { 36 + pname = "where-is-my-sddm-theme"; 37 + version = "1.9.2"; 37 38 38 - src = fetchFromGitHub { 39 - owner = "stepanzubkov"; 40 - repo = pname; 41 - rev = "v${version}"; 42 - hash = "sha256-o9SpzSmHygHix3BUaMQRwLvgy2BdDsBXmiLDU+9u/6Q="; 43 - }; 39 + src = fetchFromGitHub { 40 + owner = "stepanzubkov"; 41 + repo = "where-is-my-sddm-theme"; 42 + rev = "refs/tags/v${finalAttrs.version}"; 43 + hash = "sha256-7I8ucPuPPpUH/KyJoiwlfS7r4Bsh8ZnkHdOEED12TOQ="; 44 + }; 44 45 45 - propagatedUserEnvPkgs = 46 - [ ] 47 - ++ lib.optional (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects ] 48 - ++ lib.optional (lib.elem "qt6" variants) [ 49 - qt6.qt5compat 50 - qt6.qtsvg 51 - ]; 46 + propagatedUserEnvPkgs = 47 + [ ] 48 + ++ lib.optionals (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects ] 49 + ++ lib.optionals (lib.elem "qt6" variants) [ 50 + qt6.qt5compat 51 + qt6.qtsvg 52 + ]; 52 53 53 - installPhase = 54 - '' 55 - mkdir -p $out/share/sddm/themes/ 56 - '' 57 - + lib.optionalString (lib.elem "qt6" variants) ( 54 + installPhase = 58 55 '' 59 - cp -r where_is_my_sddm_theme/ $out/share/sddm/themes/ 56 + mkdir -p $out/share/sddm/themes/ 60 57 '' 61 - + lib.optionalString (lib.isAttrs themeConfig) '' 62 - ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme/theme.conf.user 63 - '' 64 - ) 65 - + lib.optionalString (lib.elem "qt5" variants) ( 66 - '' 67 - cp -r where_is_my_sddm_theme_qt5/ $out/share/sddm/themes/ 68 - '' 69 - + lib.optionalString (lib.isAttrs themeConfig) '' 70 - ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme_qt5/theme.conf.user 71 - '' 72 - ); 58 + + lib.optionalString (lib.elem "qt6" variants) ( 59 + '' 60 + cp -r where_is_my_sddm_theme/ $out/share/sddm/themes/ 61 + '' 62 + + lib.optionalString (lib.isAttrs themeConfig) '' 63 + ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme/theme.conf.user 64 + '' 65 + ) 66 + + lib.optionalString (lib.elem "qt5" variants) ( 67 + '' 68 + cp -r where_is_my_sddm_theme_qt5/ $out/share/sddm/themes/ 69 + '' 70 + + lib.optionalString (lib.isAttrs themeConfig) '' 71 + ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme_qt5/theme.conf.user 72 + '' 73 + ); 73 74 74 - meta = with lib; { 75 - description = "Most minimalistic SDDM theme among all themes"; 76 - homepage = "https://github.com/stepanzubkov/where-is-my-sddm-theme"; 77 - license = licenses.mit; 78 - platforms = platforms.linux; 79 - maintainers = with maintainers; [ name-snrl ]; 80 - }; 81 - } 75 + meta = { 76 + description = "Most minimalistic SDDM theme among all themes"; 77 + homepage = "https://github.com/stepanzubkov/where-is-my-sddm-theme"; 78 + license = lib.licenses.mit; 79 + platforms = lib.platforms.linux; 80 + maintainers = with lib.maintainers; [ name-snrl ]; 81 + }; 82 + })
+2 -2
pkgs/development/libraries/ucx/default.nix
··· 19 19 in 20 20 stdenv.mkDerivation rec { 21 21 pname = "ucx"; 22 - version = "1.16.0"; 22 + version = "1.17.0"; 23 23 24 24 src = fetchFromGitHub { 25 25 owner = "openucx"; 26 26 repo = "ucx"; 27 27 rev = "v${version}"; 28 - sha256 = "sha256-dihWwGlQclfa2ke+1V5c6coqfFjjuMyI8QRzNdx33zQ="; 28 + sha256 = "sha256-Qd3c51LeF04haZA4wK6loNZwX2a3ju+ljwdPYPoUKCQ="; 29 29 }; 30 30 31 31 outputs = [ "out" "doc" "dev" ];
+2 -2
pkgs/development/tools/analysis/checkov/default.nix
··· 6 6 7 7 python3.pkgs.buildPythonApplication rec { 8 8 pname = "checkov"; 9 - version = "3.2.133"; 9 + version = "3.2.136"; 10 10 pyproject = true; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "bridgecrewio"; 14 14 repo = "checkov"; 15 15 rev = "refs/tags/${version}"; 16 - hash = "sha256-mi8MPp99WViVHtMb5f6XxHiUwQkRh0DvPGRtaCUlykE="; 16 + hash = "sha256-YpzaIwrGNwlK0PgyOw3InOFKOddMFggM7JSC1H8mApQ="; 17 17 }; 18 18 19 19 patches = [ ./flake8-compat-5.x.patch ];
+2 -2
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
··· 1 1 { lib, buildGoModule, fetchFromGitLab, bash }: 2 2 3 3 let 4 - version = "16.11.1"; 4 + version = "17.0.0"; 5 5 in 6 6 buildGoModule rec { 7 7 inherit version; ··· 23 23 owner = "gitlab-org"; 24 24 repo = "gitlab-runner"; 25 25 rev = "v${version}"; 26 - sha256 = "sha256-ISL11AvKIy/tW/3MhVZ2/XT5RcaYj+x9rHKWAB/9TdU="; 26 + sha256 = "sha256-u9yA9v2UojBTDElfZhi8k9D1of0vIj3c14ZFmwa+yj4="; 27 27 }; 28 28 29 29 patches = [
+21 -21
pkgs/development/tools/electron/binary/info.json
··· 23 23 }, 24 24 "28": { 25 25 "hashes": { 26 - "aarch64-darwin": "53fc040cd09e955e013254f784cf51712029ded4a574559cf5fa19c9a911d75d", 27 - "aarch64-linux": "3e46c3076041386213f7b9ebc12335889fbad5822ffc306cf7514abb88de8512", 28 - "armv7l-linux": "2e22fbab2376a9bbeb8cbdd7d9bb3ca69fda6adeafa2b22ffb67157fcfcdb6ff", 29 - "headers": "07iv5fh0yxv17c1akb2j4ab5xhv29d9zsgi6dm2r0n4pnf72wxwr", 30 - "x86_64-darwin": "bd8a220fd906625ad4a8edf92e80e8eff89d51f40c22168e05090daa7c12bd66", 31 - "x86_64-linux": "e3be93e1a15d61f72e074aee021e12f20465b81f51b8c1170bd9072d7d695c3a" 26 + "aarch64-darwin": "c310ab098d8849c4aa05f05b1c8521031241a046e023a911f964fd1db31c64c9", 27 + "aarch64-linux": "f77107266581a6b9880757876518df1c4bf6eeff5c193bb5de0a8f6c9902bd1f", 28 + "armv7l-linux": "384d8b43f52b5350a438031ad12980418fc244b4b0aecfa5f7dcc3d6f103ebed", 29 + "headers": "1d407g6yb81l9p0pbsidrsmnzkrwb4f2qb221kc9k2r7qdpf64px", 30 + "x86_64-darwin": "6bc63916b7fe52de7559e7631fef5c93315a18ee90a0d3d08168c91414b09ecf", 31 + "x86_64-linux": "20f6be493cbd6c9924206e744b1c490af1f97f4735451b9dc19f0d305366d546" 32 32 }, 33 - "version": "28.3.1" 33 + "version": "28.3.3" 34 34 }, 35 35 "29": { 36 36 "hashes": { 37 - "aarch64-darwin": "c16d05f1231bb3c77da05ab236b454b3a2b6a642403be51e7c9b16cd2c421a19", 38 - "aarch64-linux": "c3764d6c3799950e3418e8e5a5a5b2c41abe421dd8bcdebf054c7c85798d9860", 39 - "armv7l-linux": "c5e92943ad78b4e41a32ae53c679e148ea2ae09f95f914b1834dbdbae578ba91", 40 - "headers": "0macff2ir515szp2nd6jimnpg9ig87whhfi08h2hwaxp4xn9j5hn", 41 - "x86_64-darwin": "8ed7924f77a5c43c137a57097c5c47c2e8e9a78197e18af11a767c98035c123e", 42 - "x86_64-linux": "91e5eb374c2c85a07c2d4e99a89eb18515ff0169a49c3fa75289800e1225729e" 37 + "aarch64-darwin": "e9934a8eaecaab05dcc572b47576cdba78491c144c19348c9c9e9524c8c5917b", 38 + "aarch64-linux": "a5c2bc148d3f6c3ee2bd15289243a1b75093afde3753d0aa1125d2cb621f5b59", 39 + "armv7l-linux": "a75e2487ea1a1b292fbc160618167c204f161c602780f2b997b75d6ef5bbe539", 40 + "headers": "0z4n8c95z48n54d1fph2p2i6cb43gk202zg09vmv168ajpspi2rr", 41 + "x86_64-darwin": "b875c884efe86eb2e1922781f55193d82520e923510f19af87a58dfe07d21562", 42 + "x86_64-linux": "eb07a8137fde970450242c51e0c2f8ef6556f377a21c357584aa2632ee9e1d3f" 43 43 }, 44 - "version": "29.4.0" 44 + "version": "29.4.2" 45 45 }, 46 46 "30": { 47 47 "hashes": { 48 - "aarch64-darwin": "9189d4a8d69175d94edafa4cb29a47389ebaff22c9baf0dd67a448e7a5240129", 49 - "aarch64-linux": "37b520604e319f86f372cc1da8244b27d24708a4bdc1cc07a6f1d793f37e96c3", 50 - "armv7l-linux": "6202a7ccde4ca344c01c124bd997bcfad06d475dd2e35bba70379cf2d93b5268", 51 - "headers": "15nzay60m1v720243n3iizbcldn6ka9vcphh050pih8rnh74ds5p", 52 - "x86_64-darwin": "7d9e81712a4b0ab209d03d0eef08ee9c4da1f5293fb169ff08766356a2e65fbb", 53 - "x86_64-linux": "5a2bfd0f6a8703dd1b408675c9349732c4713b378d9ae0f64ea4661f6b5c7fd4" 48 + "aarch64-darwin": "7497d7926a094d6e1bf34f70ef206c4f2d9df072b1f9fa8cd431f6ea4fab680c", 49 + "aarch64-linux": "bdb3485cd87861bb1d99f6b417f979ac899974a4322191a648efc311af9f8c5c", 50 + "armv7l-linux": "3941ab1f23576d8f55fdf525e40387f97c2c9809173a8a933402b62ec95a592f", 51 + "headers": "1jz8grs7sjncg68s34hf7rhd830414avxs1xg5lng5n7wmwfiw8i", 52 + "x86_64-darwin": "bdadef26dac934416b17fa2af6bcd55424eb8b1ceb5f6fae068dbd5fd8b0d357", 53 + "x86_64-linux": "4d00e8cd5f37962dc8fbefe2941d89dcb1c180f1568bb32122c7eb40d21f39c4" 54 54 }, 55 - "version": "30.0.6" 55 + "version": "30.1.1" 56 56 } 57 57 }
+28 -28
pkgs/development/tools/electron/info.json
··· 47 47 }, 48 48 "src/electron": { 49 49 "fetcher": "fetchFromGitHub", 50 - "hash": "sha256-YTuHUvqbVVq3gwfDFOzlRIlmfnm74u3soHem1jCVVaA=", 50 + "hash": "sha256-hyk8RsG2hIsAZRiJuYRF6HC+K7TyA76qiYsc2sH0Apw=", 51 51 "owner": "electron", 52 52 "repo": "electron", 53 - "rev": "v29.4.0" 53 + "rev": "v29.4.2" 54 54 }, 55 55 "src/media/cdm/api": { 56 56 "fetcher": "fetchFromGitiles", ··· 902 902 "electron_yarn_hash": "0f868gk3d2cablpczav8a4vhk4nfirph45yzjz18mgzgday7w8hf", 903 903 "modules": "121", 904 904 "node": "20.9.0", 905 - "version": "29.4.0" 905 + "version": "29.4.2" 906 906 }, 907 907 "30": { 908 - "chrome": "124.0.6367.207", 908 + "chrome": "124.0.6367.243", 909 909 "chromium": { 910 910 "deps": { 911 911 "gn": { ··· 915 915 "version": "2024-03-14" 916 916 } 917 917 }, 918 - "version": "124.0.6367.207" 918 + "version": "124.0.6367.243" 919 919 }, 920 920 "chromium_npm_hash": "sha256-oILlQlzTcc0YqAvK5htRvG/YXWJTDtJ60Z1EcBEj9dw=", 921 921 "deps": { 922 922 "src": { 923 923 "fetcher": "fetchFromGitiles", 924 - "hash": "sha256-mMc1mWre9XeeR4jPn30RxAXadjyqcyVyHDjSVrI5lpI=", 924 + "hash": "sha256-YrAJnuNig6v87+eNnZ2W+PCzxjGe5CuymF6ul/v9SCk=", 925 925 "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", 926 - "rev": "124.0.6367.207", 926 + "rev": "124.0.6367.243", 927 927 "url": "https://chromium.googlesource.com/chromium/src.git" 928 928 }, 929 929 "src/chrome/test/data/perf/canvas_bench": { ··· 952 952 }, 953 953 "src/electron": { 954 954 "fetcher": "fetchFromGitHub", 955 - "hash": "sha256-6f/6Deqysv8MubMjyxjiDM55DXG/9wTqBWW+zC+9OBE=", 955 + "hash": "sha256-VWc9I5wpQYv13I1xgLQVqDg6IfXMinrzJmkMaIsEY90=", 956 956 "owner": "electron", 957 957 "repo": "electron", 958 - "rev": "v30.0.6" 958 + "rev": "v30.1.1" 959 959 }, 960 960 "src/media/cdm/api": { 961 961 "fetcher": "fetchFromGitiles", ··· 977 977 }, 978 978 "src/third_party/angle": { 979 979 "fetcher": "fetchFromGitiles", 980 - "hash": "sha256-zEDHotJ6OSQlgq3nkVMhLll4j5iYl5sA1JFv854EIdM=", 981 - "rev": "c67f290ef0f0433acb766c024d28c6f59f48b909", 980 + "hash": "sha256-MFXZ7gEO8vHFHtjzzLSgGlB9AKx+hndPfmwsE5XHGXo=", 981 + "rev": "bda89e1f7c7195a9d03d037039c2dd5057563a59", 982 982 "url": "https://chromium.googlesource.com/angle/angle.git" 983 983 }, 984 984 "src/third_party/angle/third_party/VK-GL-CTS/src": { ··· 1115 1115 }, 1116 1116 "src/third_party/dawn": { 1117 1117 "fetcher": "fetchFromGitiles", 1118 - "hash": "sha256-GUB25IUviLFxGI3UQJS/kf51BZBeoYFqbiaSTSY11qA=", 1119 - "rev": "394edde38c9323f7c910e3bdec9b7efc4ee39379", 1118 + "hash": "sha256-W0E0fhjAc5gdTgIsy+iOAFA7GPEFeMPPJEU5nnRUtbM=", 1119 + "rev": "e04b03f714994b7a747b5472da4ffae9e6e38938", 1120 1120 "url": "https://dawn.googlesource.com/dawn.git" 1121 1121 }, 1122 1122 "src/third_party/dawn/third_party/dxc": { 1123 1123 "fetcher": "fetchFromGitiles", 1124 - "hash": "sha256-wsQtYqH8gFsDmLTUA7SKvTYiGQWX7Vbcz1QtsAg/epY=", 1125 - "rev": "bd7aa97798735e1288d36de41dcda75e867550e4", 1124 + "hash": "sha256-bqzkbBbf1btIz84odYfC3c69m6kgssHy2+a9aR+EUaQ=", 1125 + "rev": "511cfef8e0509d172fbfa156be8a97ed2b42590b", 1126 1126 "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" 1127 1127 }, 1128 1128 "src/third_party/dawn/third_party/dxheaders": { ··· 1181 1181 }, 1182 1182 "src/third_party/electron_node": { 1183 1183 "fetcher": "fetchFromGitHub", 1184 - "hash": "sha256-9/TPxYbnQPDpWf/Zti8bTh22e/uFRlzs7SCThfx/byQ=", 1184 + "hash": "sha256-15RUrS+zjp0nOveBnZB3bvEv36noZr2ergtNL7ky8iQ=", 1185 1185 "owner": "nodejs", 1186 1186 "repo": "node", 1187 - "rev": "v20.11.1" 1187 + "rev": "v20.14.0" 1188 1188 }, 1189 1189 "src/third_party/emoji-segmenter/src": { 1190 1190 "fetcher": "fetchFromGitiles", ··· 1502 1502 }, 1503 1503 "src/third_party/openscreen/src": { 1504 1504 "fetcher": "fetchFromGitiles", 1505 - "hash": "sha256-wUKhF9sU1HAZvs4fQHxeFfxkpkhBp6nTljJrQ4lH7lA=", 1506 - "rev": "a3f9719bed95289c59771d4c4bcb85f5ecacac43", 1505 + "hash": "sha256-4Qd5nHJxIOY7ifPy6Xf0TgZK0TkZY48scOkJ25kMCjk=", 1506 + "rev": "90e48ecc4ed9feeba36f49065c738d620d6f0780", 1507 1507 "url": "https://chromium.googlesource.com/openscreen" 1508 1508 }, 1509 1509 "src/third_party/openscreen/src/buildtools": { ··· 1526 1526 }, 1527 1527 "src/third_party/pdfium": { 1528 1528 "fetcher": "fetchFromGitiles", 1529 - "hash": "sha256-4CPHeZAJM756a2TIxs4ZX0D7j85deDIf/bTGow75m/U=", 1530 - "rev": "7b90b15a21cfdd3d74525616b5de04df94fa0583", 1529 + "hash": "sha256-/gSW4sd2AN4m3aIs9AojqsfrXeCNNrl7wFM54KeQVxw=", 1530 + "rev": "dcdd830ae4e1b14f85383d1baf84efee6bc853cc", 1531 1531 "url": "https://pdfium.googlesource.com/pdfium.git" 1532 1532 }, 1533 1533 "src/third_party/perfetto": { ··· 1586 1586 }, 1587 1587 "src/third_party/skia": { 1588 1588 "fetcher": "fetchFromGitiles", 1589 - "hash": "sha256-8C8IMQjfJGeCXCXZyd/eSbDNsdcKI/Bul0m1wrqx1P8=", 1590 - "rev": "e2ea2eb3e0d37fff47968dfaaa337debb3b75b1e", 1589 + "hash": "sha256-zHfv4OZK/nVJc2rl+dBSCc4f6qndpAKcFZtThw06+LY=", 1590 + "rev": "a747f7ea37db6ea3871816dbaf2eb41b5776c826", 1591 1591 "url": "https://skia.googlesource.com/skia.git" 1592 1592 }, 1593 1593 "src/third_party/smhasher/src": { ··· 1811 1811 }, 1812 1812 "src/v8": { 1813 1813 "fetcher": "fetchFromGitiles", 1814 - "hash": "sha256-8/XD/LwnCXDiVWeZvZsgvmSWpfVLILlaTtqw87V0Pgk=", 1815 - "rev": "ac8da461a20281ff8c30507cbdd7e6fed39fd183", 1814 + "hash": "sha256-ME/O8CJASZ8Ql931EaTRM3+6lLzGx1us/cK9Dv7Bd+s=", 1815 + "rev": "cc9dc1eb196bc3cbeca92eeec62949b4ac7cd757", 1816 1816 "url": "https://chromium.googlesource.com/v8/v8.git" 1817 1817 } 1818 1818 }, 1819 - "electron_yarn_hash": "0f868gk3d2cablpczav8a4vhk4nfirph45yzjz18mgzgday7w8hf", 1819 + "electron_yarn_hash": "0w41mjfnrhmkf2qy4lk5zwhc7afkaiqypxs4379s4ay1r6zpvf6q", 1820 1820 "modules": "123", 1821 - "node": "20.11.1", 1822 - "version": "30.0.6" 1821 + "node": "20.14.0", 1822 + "version": "30.1.1" 1823 1823 } 1824 1824 }
+7 -5
pkgs/development/tools/protoc-gen-twirp/default.nix
··· 1 - { lib, buildGoPackage, fetchFromGitHub }: 1 + { lib, buildGoModule, fetchFromGitHub }: 2 2 3 - buildGoPackage rec { 3 + buildGoModule rec { 4 4 pname = "protoc-gen-twirp"; 5 5 version = "8.1.3"; 6 6 ··· 11 11 sha256 = "sha256-p3gHVHGBHakOOQnJAuMK7vZumNXN15mOABuEHUG0wNs="; 12 12 }; 13 13 14 - goPackagePath = "github.com/twitchtv/twirp"; 14 + postPatch = '' 15 + go mod init github.com/twitchtv/twirp 16 + ''; 17 + 18 + vendorHash = null; 15 19 16 20 subPackages = [ 17 21 "protoc-gen-twirp" 18 22 ]; 19 - 20 - doCheck = true; 21 23 22 24 meta = with lib; { 23 25 description = "Simple RPC framework with protobuf service definitions";
+3 -3
pkgs/development/tools/relic/default.nix
··· 7 7 8 8 buildGoModule rec { 9 9 pname = "relic"; 10 - version = "7.6.2"; 10 + version = "8.0.1"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "sassoftware"; 14 14 repo = pname; 15 15 rev = "v${version}"; 16 - sha256 = "sha256-T76+Ftky1rSIqEoKE3RLsf6g2gguVJgYFflWmyEhdEk="; 16 + sha256 = "sha256-w7KU3XntkKep0mcuOUBSG4fJW14yCamioeRH5YrULSo="; 17 17 }; 18 18 19 - vendorHash = "sha256-5mgqIw3BV88rEF3ALD3pLhm658yUUFf44hQFSw085cU="; 19 + vendorHash = "sha256-/P4W+smY01feV1HP5Tsx0PsoOyp//ik7RVWuEaiSepY="; 20 20 21 21 ldflags = [ 22 22 "-s"
+6 -6
pkgs/os-specific/linux/r8168/default.nix
··· 6 6 in stdenv.mkDerivation rec { 7 7 name = "r8168-${kernel.version}-${version}"; 8 8 # on update please verify that the source matches the realtek version 9 - version = "8.052.01"; 9 + version = "8.053.00"; 10 10 11 11 # This is a mirror. The original website[1] doesn't allow non-interactive 12 12 # downloads, instead emailing you a download link. 13 - # [1] https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software 14 - # I've verified manually (`diff -r`) that the source code for version 8.052.01 13 + # [1] https://www.realtek.com/Download/List?cate_id=584 14 + # I've verified manually (`diff -r`) that the source code for version 8.053.00 15 15 # is the same as the one available on the realtek website. 16 16 src = fetchFromGitHub { 17 17 owner = "mtorromeo"; 18 18 repo = "r8168"; 19 19 rev = version; 20 - sha256 = "01mi7hh92nc7jaxkfrpz7j0ci78djrhgmq0im4k1270mwmvr0yzj"; 20 + sha256 = "0bHGs8jyWd+ZiixOoNkBqhS9RjDpRp3vveAgk1YuOWU="; 21 21 }; 22 22 23 23 hardeningDisable = [ "pic" ]; ··· 53 53 ''; 54 54 license = licenses.gpl2Plus; 55 55 platforms = platforms.linux; 56 - maintainers = with maintainers; [ timokau ]; 57 - broken = (lib.versions.majorMinor kernel.modDirVersion) != "5.15"; 56 + maintainers = with maintainers; []; 57 + broken = lib.versionAtLeast kernel.modDirVersion "6.9"; 58 58 }; 59 59 }
+2 -2
pkgs/servers/redpanda/default.nix
··· 7 7 , stdenv 8 8 }: 9 9 let 10 - version = "24.1.6"; 10 + version = "24.1.7"; 11 11 src = fetchFromGitHub { 12 12 owner = "redpanda-data"; 13 13 repo = "redpanda"; 14 14 rev = "v${version}"; 15 - sha256 = "sha256-zLqeokN84LrthNOg2wRmCy324sk4cMDPaTcdDbdhIoY="; 15 + sha256 = "sha256-+JCFbLWDhqHYYpeNPpcGXL8tNsi4jpGbAd8DGSIsc7A="; 16 16 }; 17 17 server = callPackage ./server.nix { inherit src version; }; 18 18 in
+3 -3
pkgs/tools/misc/opentelemetry-collector/contrib.nix
··· 8 8 9 9 buildGoModule rec { 10 10 pname = "opentelemetry-collector-contrib"; 11 - version = "0.101.0"; 11 + version = "0.102.0"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "open-telemetry"; 15 15 repo = "opentelemetry-collector-contrib"; 16 16 rev = "v${version}"; 17 - sha256 = "sha256-WdMQnAYAdyvS0uyRzvLnhi1HeoWqmUQSIq6MdcP7NfY="; 17 + sha256 = "sha256-syl4mvh78otLWnDpu/7DHlAq0UqQ+4Alg8tZ16OYBQ4="; 18 18 }; 19 19 20 20 # proxy vendor to avoid hash missmatches between linux and macOS 21 21 proxyVendor = true; 22 - vendorHash = "sha256-LM9Co4XpmyIOTVllhiiON4R8OYTO5OjY9Wn+LrU6PIM="; 22 + vendorHash = "sha256-SEj2waLnThV+anIdtZisJDusTrjObSXNPWIrWoL0gNA="; 23 23 24 24 # there is a nested go.mod 25 25 sourceRoot = "${src.name}/cmd/otelcontribcol";
+8 -12
pkgs/tools/misc/qt6gtk2/default.nix
··· 1 - { fetchFromGitHub, lib, stdenv, gtk2, pkg-config, qmake, qtbase }: 1 + { fetchFromGitHub, lib, stdenv, gtk2, pkg-config, qmake, qtbase, unstableGitUpdater }: 2 2 3 3 stdenv.mkDerivation (finalAttrs: { 4 4 pname = "qt6gtk2"; 5 - version = "0.2"; 5 + version = "0.2-unstable-2024-05-06"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "trialuser02"; 9 9 repo = finalAttrs.pname; 10 - rev = finalAttrs.version; 11 - hash = "sha256-g5ZCwTnNEJJ57zEwNqMxrl0EWYJMt3PquZ2IsmxQYqk="; 10 + rev = "d29ba6c1fb4ac933ed7b91f0480cbd0c5a975ab8"; 11 + hash = "sha256-lIUCdfsmvuzDQaOi2U/CHch1re6Jn6yDfcX26Gu0eUo="; 12 12 }; 13 13 14 14 buildInputs = [ gtk2 qtbase ]; ··· 16 16 17 17 dontWrapQtApps = true; 18 18 19 - installPhase = '' 20 - runHook preInstall 21 - 22 - mkdir -p $out/lib/qt-6/plugins/{platformthemes,styles} 23 - cp -pr src/qt6gtk2-qtplugin/libqt6gtk2.so $out/lib/qt-6/plugins/platformthemes 24 - cp -pr src/qt6gtk2-style/libqt6gtk2-style.so $out/lib/qt-6/plugins/styles 19 + qmakeFlags = [ 20 + "PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" 21 + ]; 25 22 26 - runHook postInstall 27 - ''; 23 + passthru.updateScript = unstableGitUpdater { }; 28 24 29 25 meta = { 30 26 description = "GTK+2.0 integration plugins for Qt6";