diff --git a/externals/packages/jlink/default.nix b/externals/packages/jlink/default.nix index 17b1609..7a5a581 100644 --- a/externals/packages/jlink/default.nix +++ b/externals/packages/jlink/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{JLink,bin} cp -R * $out/JLink ln -s $out/JLink/J* $out/bin/ - rm -r $out/bin/JLinkDevices.xml $out/JLink/libQt* + rm -r $out/JLink/libQt* install -D -t $out/lib/udev/rules.d 99-jlink.rules ''; diff --git a/externals/packages/jlink/version.json b/externals/packages/jlink/version.json index c1b7715..4893f94 100644 --- a/externals/packages/jlink/version.json +++ b/externals/packages/jlink/version.json @@ -1 +1 @@ -{"x86_64-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V766g_x86_64.tgz", "version": "7.66g", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-WQQ/xv4pRbqXRhD5WRqtg37Qs5JGKEcyEKMWDO20Dd8="}, "i686-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V766g_i686.tgz", "version": "7.66g", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-DWeo7ppucDJjyT17F4pfpfUI87HJSpT9256j1o8fe5s="}, "armv7l-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V766g_arm.tgz", "version": "7.66g", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-96nGdoxVfiktywLD1St33+5PUukfQc2/v9QltCAbwGY="}, "aarch64-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V766g_arm64.tgz", "version": "7.66g", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-n6vyqoBNjOAOwBGVZZFBov2F01V5c2rM2hLt0jS81w4="}} \ No newline at end of file +{"x86_64-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V782d_x86_64.tgz", "version": "7.82d", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-MTG2Z3fFYoNrk9WC6ySSniUKgSfKfVMIsihHTYTb/r0="}, "i686-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V782d_i686.tgz", "version": "7.82d", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-1DmxUvNxz7xJaWWLbivrtwGZ0tSffxPSq4Z7jKZ3POQ="}, "armv7l-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V782d_arm.tgz", "version": "7.82d", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-nPsMqwhpZ4iIUcFB9F0MnEepupMUXXQixCwmk4nlBXw="}, "aarch64-linux": {"url": "https://www.segger.com/downloads/jlink/JLink_Linux_V782d_arm64.tgz", "version": "7.82d", "curlOpts": "-d accept_license_agreement=accepted -d submit=Download+software", "hash": "sha256-xEV0khJWlhzbh3GvIvljcLR959LE06/8U3367hiBYXM="}} \ No newline at end of file diff --git a/flake.lock b/flake.lock index 548cd74..c55479e 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1668334946, - "narHash": "sha256-omMbUj4r5DVBWh7KxkoO/Z/1V1shVR6Ls4jXNB4mr3U=", + "lastModified": 1669146234, + "narHash": "sha256-HEby7EG1yaq1oT2Ze6Cvok9CFju1XHkSvVHmkptLW9U=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "e0452b33ab0ef16ffe075e980644ed92a6a200bb", + "rev": "0099253ad0b5283f06ffe31cf010af3f9ad7837d", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1668459637, - "narHash": "sha256-HqnWCKujmtu8v0CjzOT0sr7m2AR7+vpbZJOp1R0rodY=", + "lastModified": 1669418739, + "narHash": "sha256-T86oFvcUIRwHWBWUt7WjaP4BP/3lDGbv5AppQSI1FkI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "16f4e04658c2ab10114545af2f39db17d51bd1bd", + "rev": "695b3515251873e0a7e2021add4bba643c56cde3", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1668505710, - "narHash": "sha256-DulcfsGjpSXL9Ma0iQIsb3HRbARCDcA+CNH67pPyMQ0=", + "lastModified": 1669411043, + "narHash": "sha256-LfPd3+EY+jaIHTRIEOUtHXuanxm59YKgUacmSzaqMLc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85d6b3990def7eef45f4502a82496de02a02b6e8", + "rev": "5dc7114b7b256d217fe7752f1614be2514e61bb8", "type": "github" }, "original": { diff --git a/home/mpv.nix b/home/mpv.nix index 0a0578c..0f984dc 100644 --- a/home/mpv.nix +++ b/home/mpv.nix @@ -9,6 +9,7 @@ in home.packages = [ ffmpeg ]; programs.mpv = { enable = true; + package = mpv; config = { slang = "eng,en"; alang = "eng,en"; diff --git a/sets/hardware.nix b/sets/hardware.nix index 14bb8f6..db0a108 100644 --- a/sets/hardware.nix +++ b/sets/hardware.nix @@ -8,7 +8,6 @@ in (pkgs.callPackage ../externals/rules/limesuite.nix { }) pkgs.openocd pkgs.platformio - pkgs.saleae-logic-2 ]; environment.systemPackages = with pkgs; [ @@ -18,7 +17,6 @@ in stlink jlink platformio - saleae-logic-2 pkgs-unstable.proxmark3-rrg ];