Merge master into staging-next
This commit is contained in:
commit
3b46a82c2d
|
@ -114,6 +114,8 @@ let
|
|||
|
||||
version = ext.version;
|
||||
|
||||
relativeLocation = ext.vscodeExtUniqueId;
|
||||
|
||||
location = {
|
||||
"$mid" = 1;
|
||||
fsPath = ext.outPath + "/share/vscode/extensions/${ext.vscodeExtUniqueId}";
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "edge";
|
||||
version = "24.3.5";
|
||||
sha256 = "0sl4xxdsabma6q15fh0cqhgi5gmq3q2kzlw2wvcxhy78mm8qn8b0";
|
||||
vendorHash = "sha256-Oe8NMpcLGHmmlt3ceQQHHt1aV0zrWUI/TmCpyOVElCg=";
|
||||
version = "24.4.2";
|
||||
sha256 = "0apwhbcnghy7b9kwalbhcgvgcrwv6s55gzlgax55qaa5lxm6r6yz";
|
||||
vendorHash = "sha256-bLTummNoDfGMYvtfSLxICgCFZEymPJcRWkQyWOSzKR8=";
|
||||
}
|
||||
|
|
|
@ -2,29 +2,16 @@
|
|||
, lib
|
||||
, alsa-lib
|
||||
, autoPatchelfHook
|
||||
, buildFHSEnv
|
||||
, ciscoPacketTracer8
|
||||
, copyDesktopItems
|
||||
, dbus
|
||||
, dpkg
|
||||
, expat
|
||||
, fontconfig
|
||||
, glib
|
||||
, libdrm
|
||||
, libglvnd
|
||||
, libpulseaudio
|
||||
, libudev0-shim
|
||||
, libxkbcommon
|
||||
, libxml2
|
||||
, libxslt
|
||||
, lndir
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, nspr
|
||||
, nss
|
||||
, qt5
|
||||
, requireFile
|
||||
, xorg
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -40,14 +27,14 @@ let
|
|||
};
|
||||
in
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation (args: {
|
||||
pname = "ciscoPacketTracer8";
|
||||
|
||||
version = "8.2.2";
|
||||
|
||||
src = requireFile {
|
||||
name = names.${version};
|
||||
hash = hashes.${version};
|
||||
name = names.${args.version};
|
||||
hash = hashes.${args.version};
|
||||
url = "https://www.netacad.com";
|
||||
};
|
||||
|
||||
|
@ -88,6 +75,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
|
||||
makeWrapper "$out/opt/pt/bin/PacketTracer" "$out/bin/packettracer8" \
|
||||
"''${qtWrapperArgs[@]}" \
|
||||
--set QT_QPA_PLATFORMTHEME "" \
|
||||
--prefix LD_LIBRARY_PATH : "$out/opt/pt/bin"
|
||||
|
||||
install -D $out/opt/pt/art/app.png $out/share/icons/hicolor/128x128/apps/ciscoPacketTracer8.png
|
||||
|
@ -122,4 +110,4 @@ stdenvNoCC.mkDerivation rec {
|
|||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "packettracer8";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
- job control
|
||||
'';
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
maintainers = with lib.maintainers; [ AndersonTorres suominen ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
description = "BIRD Internet Routing Daemon";
|
||||
homepage = "http://bird.network.cz";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ herbetom ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue