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: ee3458392b5a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4f4d792e709a
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Jan 17, 2020

  1. gns3: Fix python package not being pinned (#77701) 

    Due to #44426 the correct psutils
package is not picked up, this commit changes the code so the correct
version is always picked.
    @Alan01252 @primeos
    Alan01252 authored and primeos committed Jan 17, 2020
    Copy the full SHA
    4f4d792 View commit details
Showing with 34 additions and 38 deletions.
  1. +13 −2 pkgs/applications/networking/gns3/default.nix
  2. +11 −18 pkgs/applications/networking/gns3/gui.nix
  3. +10 −18 pkgs/applications/networking/gns3/server.nix
15 changes: 13 additions & 2 deletions pkgs/applications/networking/gns3/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,8 +7,19 @@ let
let version = if args.stable then stableVersion else previewVersion;
branch = if args.stable then "stable" else "preview";
in args // { inherit version branch; };
mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
extraArgs = {
mkOverride = attrname: version: sha256:
self: super: {
${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: {
inherit version;
src = oldAttrs.src.override {
inherit version sha256;
};
});
};
};
mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };
guiSrcHash = "1yxwbz93x9hn5y6dir8v7bdfsmfgppvjg4z88l8gx82hhf2476fx";
serverSrcHash = "1d3m8qrz82g8ii6q6j015wqwp6j0415fbqbjvw43zhdx5mnn962d";
in {
29 changes: 11 additions & 18 deletions pkgs/applications/networking/gns3/gui.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
{ stable, branch, version, sha256Hash }:
{ stable, branch, version, sha256Hash, mkOverride }:

{ stdenv, python3, fetchFromGitHub }:
{ lib, stdenv, python3, fetchFromGitHub }:

let
# TODO: This package requires qt5Full to launch
defaultOverrides = [
(mkOverride "psutil" "5.6.3"
"1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6")
(mkOverride "jsonschema" "2.6.0"
"00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg")
];

python = python3.override {
packageOverrides = self: super: {
psutil = super.psutil.overridePythonAttrs (oldAttrs: rec {
version = "5.6.3";
src = oldAttrs.src.override {
inherit version;
sha256 = "1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6";
};
});
jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {
version = "2.6.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg";
};
});
};
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) defaultOverrides;
};
in python.pkgs.buildPythonPackage rec {
name = "${pname}-${version}";
28 changes: 10 additions & 18 deletions pkgs/applications/networking/gns3/server.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,17 @@
{ stable, branch, version, sha256Hash }:
{ stable, branch, version, sha256Hash, mkOverride }:

{ stdenv, python3, fetchFromGitHub }:
{ lib, stdenv, python3, fetchFromGitHub }:

let
defaultOverrides = [
(mkOverride "psutil" "5.6.3"
"1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6")
(mkOverride "jsonschema" "2.6.0"
"00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg")
];

python = python3.override {
packageOverrides = self: super: {
psutil = super.psutil.overridePythonAttrs (oldAttrs: rec {
version = "5.6.3";
src = oldAttrs.src.override {
inherit version;
sha256 = "1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6";
};
});
jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {
version = "2.6.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg";
};
});
};
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) defaultOverrides;
};
in python.pkgs.buildPythonPackage {
pname = "gns3-server";