openwebrx: migrate to by-name

openwebrx: refactor package definitions

+38 -48
+38 -38
pkgs/applications/radio/openwebrx/default.nix pkgs/by-name/op/openwebrx/package.nix
··· 1 1 { 2 2 stdenv, 3 3 lib, 4 - buildPythonPackage, 5 - buildPythonApplication, 4 + python3Packages, 6 5 fetchFromGitHub, 7 6 pkg-config, 8 7 cmake, 9 - setuptools, 10 8 libsamplerate, 11 9 fftwFloat, 12 10 rtl-sdr, 13 11 soapysdr-with-plugins, 14 12 csdr, 15 - pycsdr, 16 - pydigiham, 17 13 direwolf, 18 14 sox, 19 15 wsjtx, ··· 22 18 23 19 let 24 20 25 - js8py = buildPythonPackage rec { 21 + js8py = python3Packages.buildPythonPackage rec { 26 22 pname = "js8py"; 27 23 version = "0.1.1"; 28 24 format = "setuptools"; 29 25 30 26 src = fetchFromGitHub { 31 27 owner = "jketterl"; 32 - repo = pname; 33 - rev = version; 34 - sha256 = "1j80zclg1cl5clqd00qqa16prz7cyc32bvxqz2mh540cirygq24w"; 28 + repo = "js8py"; 29 + tag = version; 30 + hash = "sha256-nAj8fI4MkAKr+LjvJQbz7Px8TVAYA9AwZYWy8Cj7AMk="; 35 31 }; 36 32 37 33 pythonImportsCheck = [ ··· 39 35 "test" 40 36 ]; 41 37 42 - meta = with lib; { 38 + meta = { 43 39 homepage = "https://github.com/jketterl/js8py"; 44 40 description = "Library to decode the output of the js8 binary of JS8Call"; 45 - license = licenses.gpl3Only; 46 - teams = [ teams.c3d2 ]; 41 + license = lib.licenses.gpl3Only; 42 + teams = with lib.teams; [ c3d2 ]; 47 43 }; 48 44 }; 49 45 ··· 53 49 54 50 src = fetchFromGitHub { 55 51 owner = "jketterl"; 56 - repo = pname; 57 - rev = version; 58 - sha256 = "sha256-1H0TJ8QN3b6Lof5TWvyokhCeN+dN7ITwzRvEo2X8OWc="; 52 + repo = "owrx_connector"; 53 + tag = version; 54 + hash = "sha256-1H0TJ8QN3b6Lof5TWvyokhCeN+dN7ITwzRvEo2X8OWc="; 59 55 }; 60 56 61 57 nativeBuildInputs = [ ··· 71 67 soapysdr-with-plugins 72 68 ]; 73 69 74 - meta = with lib; { 70 + meta = { 75 71 homepage = "https://github.com/jketterl/owrx_connector"; 76 72 description = "Set of connectors that are used by OpenWebRX to interface with SDR hardware"; 77 - license = licenses.gpl3Only; 78 - platforms = platforms.unix; 79 - teams = [ teams.c3d2 ]; 73 + license = lib.licenses.gpl3Only; 74 + platforms = lib.platforms.unix; 75 + teams = with lib.teams; [ c3d2 ]; 80 76 }; 81 77 }; 82 78 83 79 in 84 - buildPythonApplication rec { 80 + python3Packages.buildPythonApplication rec { 85 81 pname = "openwebrx"; 86 82 version = "1.2.2"; 87 83 format = "setuptools"; 88 84 89 85 src = fetchFromGitHub { 90 86 owner = "jketterl"; 91 - repo = pname; 92 - rev = version; 87 + repo = "openwebrx"; 88 + tag = version; 93 89 hash = "sha256-i3Znp5Sxs/KtJazHh2v9/2P+3cEocWB5wIpF7E4pK9s="; 94 90 }; 95 91 96 - propagatedBuildInputs = [ 97 - setuptools 98 - csdr 99 - pycsdr 100 - pydigiham 101 - js8py 102 - soapysdr-with-plugins 103 - owrx_connector 104 - direwolf 105 - sox 106 - wsjtx 107 - codecserver 108 - ]; 92 + dependencies = 93 + with python3Packages; 94 + [ 95 + setuptools 96 + csdr 97 + pycsdr 98 + pydigiham 99 + ] 100 + ++ [ 101 + js8py 102 + soapysdr-with-plugins 103 + owrx_connector 104 + direwolf 105 + sox 106 + wsjtx 107 + codecserver 108 + ]; 109 109 110 110 pythonImportsCheck = [ 111 111 "csdr" ··· 117 117 inherit js8py owrx_connector; 118 118 }; 119 119 120 - meta = with lib; { 120 + meta = { 121 121 homepage = "https://github.com/jketterl/openwebrx"; 122 122 description = "Simple DSP library and command-line tool for Software Defined Radio"; 123 123 mainProgram = "openwebrx"; 124 - license = licenses.gpl3Only; 125 - teams = [ teams.c3d2 ]; 124 + license = lib.licenses.gpl3Only; 125 + teams = with lib.teams; [ c3d2 ]; 126 126 }; 127 127 }
-10
pkgs/top-level/all-packages.nix
··· 9015 9015 openssl_3_5 9016 9016 ; 9017 9017 9018 - openwebrx = callPackage ../applications/radio/openwebrx { 9019 - inherit (python3Packages) 9020 - buildPythonPackage 9021 - buildPythonApplication 9022 - setuptools 9023 - pycsdr 9024 - pydigiham 9025 - ; 9026 - }; 9027 - 9028 9018 pcre = callPackage ../development/libraries/pcre { }; 9029 9019 # pcre32 seems unused 9030 9020 pcre-cpp = res.pcre.override { variant = "cpp"; };