Unverified Commit 3c4a38a9 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 9cbb132d 4d85371d

pkgs/by-name/dy/dynamips/package.nix

+10 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  stdenv,

  cmake,

  fetchFromGitHub,

  fetchpatch,

  libelf,

  libpcap,

  nix-update-script,
@@ -19,6 +20,15 @@ stdenv.mkDerivation rec { 
    hash = "sha256-+h+WsZ/QrDd+dNrR6CJb2uMG+vbUvK8GTxFJZOxknL0=";

  };



  patches = [

    # https://github.com/GNS3/dynamips/issues/305

    (fetchpatch {

      name = "cmake4-compat.patch";

      url = "https://github.com/GNS3/dynamips/commit/fdbbb7d3887eaa5b024bbcbcc14215f420a7e989.patch";

      hash = "sha256-CbiPGrIqn9KGnZEPUw7LiH8dkqzjfu4UxW1f7Fzbwro=";

    })

  ];



  nativeBuildInputs = [ cmake ];



  buildInputs = [

pkgs/by-name/oc/oci-cli/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -25,14 +25,14 @@ in 


py.pkgs.buildPythonApplication rec {

  pname = "oci-cli";

  version = "3.67.0";

  version = "3.68.0";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "oracle";

    repo = "oci-cli";

    tag = "v${version}";

    hash = "sha256-sdd0/kUUqxMzmoeY0QZHSSQF+XVNWnzZRI5GIhR3W5s=";

    hash = "sha256-gkMTfF77yfjx4CxhJ+mpNA1HsDjXMBMwDaI67dJF/8I=";

  };



  nativeBuildInputs = [ installShellFiles ];

pkgs/by-name/ro/rofi-nerdy/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -9,16 +9,16 @@ 
}:

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "rofi-nerdy";

  version = "0.0.8";

  version = "0.0.9";



  src = fetchFromGitHub {

    owner = "Rolv-Apneseth";

    repo = "rofi-nerdy";

    tag = "v${finalAttrs.version}";

    hash = "sha256-RiQ8bP7Q1ItZfCO94R95aTenqVOD45ohfUdmtDn0r9k=";

    hash = "sha256-FxMRUE4OKF0e1gNVFuEIGCbV83tUVj4ZNZFCjFqNb64=";

  };



  cargoHash = "sha256-NvS38uTqlBTUmRg2z0Faa5bTlRC/DTXQU3MCcSmPerA=";

  cargoHash = "sha256-z7pfVLlOZFKxoqk87cHFd//DOArCvTpPK83UmJwmdtw=";



  nativeBuildInputs = [ pkg-config ];

pkgs/development/python-modules/ansible-compat/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -23,14 +23,14 @@ 


buildPythonPackage rec {

  pname = "ansible-compat";

  version = "25.8.1";

  version = "25.8.2";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "ansible";

    repo = "ansible-compat";

    tag = "v${version}";

    hash = "sha256-u1yBRhE4i30RAyFe5UtRPyVeOYRzec2VE2H5qmH3dGM=";

    hash = "sha256-g3iSSj42QB0kr0yTIfUVR9q2NCu/peQTRStlUjKKkl8=";

  };



  build-system = [

pkgs/development/python-modules/virtkey/default.nix

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
{

  stdenv,

  lib,

  buildPythonPackage,

  fetchurl,

  pkg-config,

  gtk2,

  libX11,

  libXtst,

  libXi,

  libxkbfile,

  xorgproto,

}:



let

  majorVersion = "0.63";

  minorVersion = "0";

in

buildPythonPackage rec {

  pname = "virtkey";

  version = "${majorVersion}.${minorVersion}";

  format = "setuptools";



  src = fetchurl {

    url = "https://launchpad.net/virtkey/${majorVersion}/${version}/+download/virtkey-${version}.tar.gz";

    sha256 = "0hd99hrxn6bh3rxcrdnad5cqjsphrn1s6fzx91q07d44k6cg6qcr";

  };



  nativeBuildInputs = [ pkg-config ];



  buildInputs = [

    gtk2

    libX11

    libXtst

    libXi

    libxkbfile

    xorgproto

  ];



  meta = with lib; {

    broken = stdenv.hostPlatform.isDarwin;

    description = "Extension to emulate keypresses and to get the layout information from the X server";

    homepage = "https://launchpad.net/virtkey";

    license = licenses.gpl3;

    maintainers = [ ];

  };

}