Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 679e8fa932c4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 469a36cdb9a4
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 21, 2018

  1. gns3-server: Switch to overrideAttrs

    @primeos
    primeos committed Dec 21, 2018
    Copy the full SHA
    469a36c View commit details
Showing with 6 additions and 6 deletions.
  1. +6 −6 pkgs/applications/networking/gns3/server.nix
12 changes: 6 additions & 6 deletions pkgs/applications/networking/gns3/server.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

let
pythonPackages = python36Packages;
async-timeout = (stdenv.lib.overrideDerivation pythonPackages.async-timeout
async-timeout = pythonPackages.async-timeout.overrideAttrs
(oldAttrs:
rec {
pname = "async-timeout";
@@ -13,8 +13,8 @@ let
inherit pname version;
sha256 = "1l3kg062m02mph6rf9rdv8r5c5n356clxa6b6mrn0i77vk9g9kq0";
};
}));
aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp
});
aiohttp = pythonPackages.aiohttp.overrideAttrs
(oldAttrs:
rec {
pname = "aiohttp";
@@ -25,8 +25,8 @@ let
};
propagatedBuildInputs = [ async-timeout ]
++ (with pythonPackages; [ attrs chardet multidict yarl idna-ssl ]);
}));
aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors
});
aiohttp-cors = pythonPackages.aiohttp-cors.overrideAttrs
(oldAttrs:
rec {
pname = "aiohttp-cors";
@@ -40,7 +40,7 @@ let
++ stdenv.lib.optional
(pythonPackages.pythonOlder "3.5")
pythonPackages.typing;
}));
});
in pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "gns3-server";