diff options
Diffstat (limited to 'pkgs/applications')
11 files changed, 67 insertions, 24 deletions
diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index 243fe0560069e..b8d2adc909f29 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -37,6 +37,9 @@ let sha256 = "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM="; }; + arch = { + x86_64 = "amd64"; + }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name; in stdenv.mkDerivation rec { pname = "processing"; @@ -50,16 +53,16 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ant unzip makeWrapper wrapGAppsHook ]; - buildInputs = [ jdk javaPackages.jogl_2_3_2 ant rsync ffmpeg batik ]; + buildInputs = [ jdk javaPackages.jogl_2_4_0 ant rsync ffmpeg batik ]; dontWrapGApps = true; buildPhase = '' echo "tarring jdk" - tar --checkpoint=10000 -czf build/linux/jdk-17.0.6-amd64.tgz ${jdk} + tar --checkpoint=10000 -czf build/linux/jdk-17.0.6-${arch}.tgz ${jdk} cp ${ant}/lib/ant/lib/{ant.jar,ant-launcher.jar} app/lib/ mkdir -p core/library - ln -s ${javaPackages.jogl_2_3_2}/share/java/* core/library/ + ln -s ${javaPackages.jogl_2_4_0}/share/java/* core/library/ ln -s ${vaqua} app/lib/VAqua9.jar ln -s ${flatlaf} app/lib/flatlaf.jar ln -s ${lsp4j} java/mode/org.eclipse.lsp4j.jar diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index 1618bf746ce0f..abf3f53e32a86 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.isc; maintainers = with maintainers; [ SlothOfAnarchy ]; platforms = platforms.linux; + mainProgram = "batsignal"; }; } diff --git a/pkgs/applications/misc/hyprdim/default.nix b/pkgs/applications/misc/hyprdim/default.nix new file mode 100644 index 0000000000000..26915802fac8f --- /dev/null +++ b/pkgs/applications/misc/hyprdim/default.nix @@ -0,0 +1,40 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "hyprdim"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "donovanglover"; + repo = pname; + rev = version; + hash = "sha256-0FSviEaKANTHBZa12NbNKnOfcbXQLQzJBGMDruq71+g="; + }; + + cargoHash = "sha256-eNtieSj4tr5CeH4BDclkp41QGQLkjYgLXil7sXQcfdU="; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + installManPage man/hyprdim.1 + + installShellCompletion --cmd hyprdim \ + --bash <(cat completions/hyprdim.bash) \ + --fish <(cat completions/hyprdim.fish) \ + --zsh <(cat completions/_hyprdim) + ''; + + meta = with lib; { + description = "Automatically dim windows in Hyprland when switching between them"; + homepage = "https://github.com/donovanglover/hyprdim"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ donovanglover ]; + }; +} diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 387f54e21544b..f5cd73e031375 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -67,5 +67,6 @@ buildPythonApplication rec { license = licenses.gpl3; maintainers = with maintainers; [ srghma ]; platforms = platforms.linux; + mainProgram = "safeeyes"; }; } diff --git a/pkgs/applications/misc/yambar/default.nix b/pkgs/applications/misc/yambar/default.nix index 2cb4cad91d4b7..7d974bf87fd4e 100644 --- a/pkgs/applications/misc/yambar/default.nix +++ b/pkgs/applications/misc/yambar/default.nix @@ -44,12 +44,15 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "man" ]; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ bison flex meson ninja pkg-config + scdoc wayland-scanner ]; @@ -62,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: { pipewire pixman pulseaudio - scdoc tllist udev ] ++ lib.optionals (waylandSupport) [ diff --git a/pkgs/applications/networking/cluster/kubevpn/default.nix b/pkgs/applications/networking/cluster/kubevpn/default.nix index 0460213ba5544..9bd4747d2dcfc 100644 --- a/pkgs/applications/networking/cluster/kubevpn/default.nix +++ b/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubevpn"; - version = "1.1.34"; + version = "1.1.35"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - sha256 = "sha256-P4lROZ6UxsCtMwGWIDBkXjd8v/wtD7u9LBoUUzP9Tz0="; + sha256 = "sha256-fY0SKluJ1SG323rV7eDdhmDSMn49aITXYyFhR2ArFTw="; }; - vendorHash = "sha256-LihRVqVMrN45T9NLOQw/EsrEMTSLYYhWzVm+lYXtFRQ="; + vendorHash = "sha256-aU8/C/p/VQ3JYApgr/i5dE/nBs0QjsvXBSMnEmj/Sno="; # TODO investigate why some config tests are failing doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index b150c2f9fbbf9..ea1ab235fc466 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,8 +1,8 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.23.0"; - hash = "sha256-WZe1fJ6H+h7QcXn+gR7OJ+KSOgd9NxTDLMs7UOFeq70="; + version = "6.27.1"; + hash = "sha256-nEOt6bep6SqhAab8yD9NlRrDGU2IvZeOxSqPj2u1bio="; }; signal-desktop-beta = { dir = "Signal Beta"; diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 8a6ca39ee3bb4..7e0ea7e815626 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -1,7 +1,7 @@ { lib , buildGoModule , fetchFromGitHub -, gitUpdater +, nix-update-script , makeWrapper , openssh , libxcrypt @@ -11,26 +11,23 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - hash = "sha256-WKMy2JttXFRcW1yb5aQ6xe8BoSoN65K8Hlmac62+QPc="; + hash = "sha256-OvXbc3feCatyubbRZlaiXvGP59ApyAS0b0Z6SeJsZnE="; }; modRoot = "./agent"; - vendorHash = "sha256-BqzpQcL3U6SIrDW5NfBG0D2zyvv1zNu7uoOBYmKbF4Y="; + vendorHash = "sha256-qQRi4GeepRpYPhE5ftUj01tMCqBh5txbizfkVXmrgOQ="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; passthru = { - updateScript = gitUpdater { - rev-prefix = "v"; - ignoredVersions = ".(rc|beta).*"; - }; + updateScript = nix-update-script { }; tests.version = testers.testVersion { package = shellhub-agent; diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index d4b678d36f979..a4173d1f5e6d8 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -11,8 +11,8 @@ let inherit (pkgs) symlinkJoin callPackage nodePackages; - python3 = pkgs.python3.override { - packageOverrides = self: super: { + python3 = pkgs.python3 // { + pkgs = pkgs.python3.pkgs.overrideScope (self: super: { # `sagelib`, i.e. all of sage except some wrappers and runtime dependencies sagelib = self.callPackage ./sagelib.nix { inherit flint arb; @@ -29,7 +29,7 @@ let sage-setup = self.callPackage ./python-modules/sage-setup.nix { inherit sage-src; }; - }; + }); }; jupyter-kernel-definition = { diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index 15b001b4561e4..a08f5da441fc3 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -44,6 +44,5 @@ mavenJdk11.buildMavenPackage rec { ]; license = licenses.gpl3; maintainers = [ maintainers.taeer ]; - platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index d0d7624df81ea..3029adbd817b3 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -43,16 +43,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.0.9"; + version = "0.0.16"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "v${version}"; - hash = "sha256-faK0KShbMUuvFbR2m9oCeWSwwrSxyXNWreODtHFyp5U="; + hash = "sha256-jyfobmwDCsvhpKcAD0ivxfRENaTVjjauRBMDNPgvjVY="; }; - cargoHash = "sha256-54uyqk6fW3pHCK7JC5T7c8C/0Hcq0K/PBn71tNwnA0g="; + cargoHash = "sha256-efMw07KH8Nic76MWTyf16Gg/8PyM9gZKSNs5cuIKBJQ="; nativeBuildInputs = [ autoPatchelfHook |