Unverified Commit 5e4bb4a8 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

various: modernize derivations, remove unnecessary recursiveness (#460756)

parents be2eb5aa 70947273

pkgs/development/octave-modules/octproj/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ buildOctavePackage rec { 


  src = fetchFromBitbucket {

    owner = "jgpallero";

    repo = pname;

    repo = "octproj";

    rev = "OctPROJ-${version}";

    sha256 = "sha256-d/Zf172Etj+GA0cnGsQaKMjOmirE7Hwyj4UECpg7QFM=";

  };

pkgs/development/tools/misc/whatstyle/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -11,15 +11,15 @@ python3.pkgs.buildPythonApplication rec { 
  format = "setuptools";

  src = fetchFromGitHub {

    owner = "mikr";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-4LCZAEUQFPl4CBPeuqsodiAlwd8uBg+SudF5d+Vz4Gc=";

    repo = "whatstyle";

    tag = "v${version}";

    hash = "sha256-4LCZAEUQFPl4CBPeuqsodiAlwd8uBg+SudF5d+Vz4Gc=";

  };



  # Fix references to previous version, to avoid confusion:

  postPatch = ''

    substituteInPlace setup.py --replace 0.1.6 ${version}

    substituteInPlace ${pname}.py --replace 0.1.6 ${version}

    substituteInPlace setup.py --replace-fail 0.1.9 ${version}

    substituteInPlace whatstyle.py --replace-fail 0.1.9 ${version}

  '';



  nativeCheckInputs = [

pkgs/development/tools/prospector/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { 


  src = fetchFromGitHub {

    owner = "PyCQA";

    repo = pname;

    repo = "prospector";

    tag = "v${version}";

    hash = "sha256-94JGKX91d2kul+KMYohga9KCOj6RN/YKpD8e4nWSOOM=";

  };

pkgs/os-specific/linux/cpupower-gui/default.nix

+2 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
  pkg-config,

  pygobject3,

  pyxdg,

  systemd,

  wrapGAppsHook3,

}:
@@ -31,8 +30,8 @@ buildPythonApplication rec { 


  src = fetchFromGitHub {

    owner = "vagnum08";

    repo = pname;

    rev = "v${version}";

    repo = "cpupower-gui";

    tag = "v${version}";

    sha256 = "05lvpi3wgyi741sd8lgcslj8i7yi3wz7jwl7ca3y539y50hwrdas";

  };

pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix

+2 −3
Original line number Diff line number Diff line
@@ -4,19 +4,18 @@ 
  fetchFromGitHub,

  kernel,

  kernelModuleMakeFlags,

  kmod,

}:



let

  kerneldir = "lib/modules/${kernel.modDirVersion}";

in

stdenv.mkDerivation rec {

stdenv.mkDerivation {

  pname = "gcadapter-oc-kmod";

  version = "unstable-2021-12-11";



  src = fetchFromGitHub {

    owner = "HannesMann";

    repo = pname;

    repo = "gcadapter-oc-kmod";

    rev = "d4ddf15deb74c51dbdfc814d481ef127c371f444";

    sha256 = "sha256-bHA1611rcO8/d48b1CHsiurEt3/n+5WErtHXAU7Eh1o=";

  };