artemist/nixos-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Actually use mpv settings, remove saleae logic, update jlink

Browse source
This commit is contained in:
Artemis Tosini 2022-11-26 23:30:50 +00:00
parent 25c687f497
commit 180b64ff84
Signed by: artemist
GPG key ID: EE5227935FE3FF18
5 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
externals/packages/jlink/default.nix vendored
View file

@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/{JLink,bin} mkdir -p $out/{JLink,bin}
cp -R * $out/JLink cp -R * $out/JLink
ln -s $out/JLink/J* $out/bin/ 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 install -D -t $out/lib/udev/rules.d 99-jlink.rules
''; '';

2
externals/packages/jlink/version.json vendored
View file

@ -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="}} {"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="}}

18
flake.lock
View file

@ -23,11 +23,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1668334946, "lastModified": 1669146234,
"narHash": "sha256-omMbUj4r5DVBWh7KxkoO/Z/1V1shVR6Ls4jXNB4mr3U=", "narHash": "sha256-HEby7EG1yaq1oT2Ze6Cvok9CFju1XHkSvVHmkptLW9U=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "e0452b33ab0ef16ffe075e980644ed92a6a200bb", "rev": "0099253ad0b5283f06ffe31cf010af3f9ad7837d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -38,11 +38,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1668459637, "lastModified": 1669418739,
"narHash": "sha256-HqnWCKujmtu8v0CjzOT0sr7m2AR7+vpbZJOp1R0rodY=", "narHash": "sha256-T86oFvcUIRwHWBWUt7WjaP4BP/3lDGbv5AppQSI1FkI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "16f4e04658c2ab10114545af2f39db17d51bd1bd", "rev": "695b3515251873e0a7e2021add4bba643c56cde3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -54,11 +54,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1668505710, "lastModified": 1669411043,
"narHash": "sha256-DulcfsGjpSXL9Ma0iQIsb3HRbARCDcA+CNH67pPyMQ0=", "narHash": "sha256-LfPd3+EY+jaIHTRIEOUtHXuanxm59YKgUacmSzaqMLc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "85d6b3990def7eef45f4502a82496de02a02b6e8", "rev": "5dc7114b7b256d217fe7752f1614be2514e61bb8",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
home/mpv.nix
View file

@ -9,6 +9,7 @@ in
home.packages = [ ffmpeg ]; home.packages = [ ffmpeg ];
programs.mpv = { programs.mpv = {
enable = true; enable = true;
package = mpv;
config = { config = {
slang = "eng,en"; slang = "eng,en";
alang = "eng,en"; alang = "eng,en";

2
sets/hardware.nix
View file

@ -8,7 +8,6 @@ in
(pkgs.callPackage ../externals/rules/limesuite.nix { }) (pkgs.callPackage ../externals/rules/limesuite.nix { })
pkgs.openocd pkgs.openocd
pkgs.platformio pkgs.platformio
pkgs.saleae-logic-2
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -18,7 +17,6 @@ in
stlink stlink
jlink jlink
platformio platformio
saleae-logic-2
pkgs-unstable.proxmark3-rrg pkgs-unstable.proxmark3-rrg
]; ];