···

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
python3Packages.buildPythonApplication rec {

     

       
15
       
15
       
 
       
  pname = "snapcraft";

     

       
16
       
16
       
-
       
  version = "8.6.1";

     

       
16
       
16
       
+
       
  version = "8.7.0";

     

       
17
       
17
       
 
       


     

       
18
       
18
       
 
       
  pyproject = true;

     

       
19
       
19
       
 
       


     
···

       
21
       
21
       
 
       
    owner = "canonical";

     

       
22
       
22
       
 
       
    repo = "snapcraft";

     

       
23
       
23
       
 
       
    tag = version;

     

       
24
       
24
       
-
       
    hash = "sha256-SbxsgvDptkUl8gHAIrJvnzIPOh0/R81n8cgJWBH7BXQ=";

     

       
24
       
24
       
+
       
    hash = "sha256-AFqCIqU3XAITrnRp0VzFzvW1LGSJPTFS6VWSR3qF1Pc=";

     

       
25
       
25
       
 
       
  };

     

       
26
       
26
       
 
       


     

       
27
       
27
       
 
       
  patches = [

     
···

       
43
       
43
       
 
       
  ];

     

       
44
       
44
       
 
       


     

       
45
       
45
       
 
       
  postPatch = ''

     

       
46
       
46
       
-
       
    substituteInPlace setup.py \

     

       
47
       
47
       
-
       
      --replace-fail 'version=determine_version()' 'version="${version}"' \

     

       
48
       
48
       
-
       
      --replace-fail 'gnupg' 'python-gnupg'

     

       
49
       
49
       
-
       


     

       
50
       
50
       
-
       
    substituteInPlace requirements.txt \

     

       
51
       
51
       
-
       
      --replace-fail 'gnupg==2.3.1' 'python-gnupg'

     

       
52
       
52
       
-
       


     

       
53
       
53
       
-
       
    substituteInPlace snapcraft/__init__.py \

     

       
54
       
54
       
-
       
      --replace-fail '__version__ = _get_version()' '__version__ = "${version}"'

     

       
46
       
46
       
+
       
    substituteInPlace snapcraft/__init__.py --replace-fail "dev" "${version}"

     

       
55
       
47
       
 
       


     

       
56
       
48
       
 
       
    substituteInPlace snapcraft_legacy/__init__.py \

     

       
57
       
49
       
 
       
      --replace-fail '__version__ = _get_version()' '__version__ = "${version}"'

     
···

       
60
       
52
       
 
       
      --replace-fail 'arch_linker_path = Path(arch_config.dynamic_linker)' \

     

       
61
       
53
       
 
       
      'return str(Path("${glibc}/lib/ld-linux-x86-64.so.2"))'

     

       
62
       
54
       
 
       


     

       
63
       
63
       
-
       
    substituteInPlace pyproject.toml \

     

       
64
       
64
       
-
       
      --replace-fail '"pytest-cov>=4.0",' ""

     

       
55
       
55
       
+
       
    substituteInPlace pyproject.toml --replace-fail 'gnupg' 'python-gnupg'

     

       
65
       
56
       
 
       
  '';

     

       
66
       
57
       
 
       


     

       
67
       
58
       
 
       
  nativeBuildInputs = [ makeWrapper ];

     
···

       
110
       
101
       
 
       
    validators

     

       
111
       
102
       
 
       
  ];

     

       
112
       
103
       
 
       


     

       
113
       
113
       
-
       
  build-system = with python3Packages; [ setuptools ];

     

       
104
       
104
       
+
       
  build-system = with python3Packages; [ setuptools-scm ];

     

       
114
       
105
       
 
       


     

       
115
       
106
       
 
       
  pythonRelaxDeps = [

     

       
116
       
107
       
 
       
    "craft-parts"

     

       
108
       
108
       
+
       
    "cryptography"

     

       
117
       
109
       
 
       
    "docutils"

     

       
118
       
110
       
 
       
    "jsonschema"

     

       
119
       
111
       
 
       
    "pygit2"

     

···

       
1
       
1
       
 
       
diff --git a/snapcraft_legacy/internal/common.py b/snapcraft_legacy/internal/common.py

     

       
2
       
2
       
-
       
index 6017b405..aacd99a5 100644

     

       
2
       
2
       
+
       
index b3d40c265..c68c24d53 100644

     

       
3
       
3
       
 
       
--- a/snapcraft_legacy/internal/common.py

     

       
4
       
4
       
 
       
+++ b/snapcraft_legacy/internal/common.py

     

       
5
       
5
       
-
       
@@ -34,14 +34,17 @@ from snaphelpers import SnapConfigOptions, SnapCtlError

     

       
5
       
5
       
+
       
@@ -36,7 +36,10 @@ from snapcraft_legacy.internal import errors

     

       
6
       
6
       
 
       
 

     

       
7
       
7
       
-
       
 from snapcraft_legacy.internal import errors

     

       
7
       
7
       
+
       
 SNAPCRAFT_FILES = ["parts", "stage", "prime"]

     

       
8
       
8
       
 
       
 

     

       
9
       
9
       
+
       
-_DEFAULT_PLUGINDIR = os.path.join(sys.prefix, "share", "snapcraft", "plugins")

     

       
9
       
10
       
 
       
+# Get the path to the Nix store entry for Snapcraft at runtime

     

       
10
       
11
       
 
       
+drv = os.path.realpath(__file__).split("/")[3]

     

       
11
       
12
       
 
       
+

     

       
12
       
12
       
-
       
 SNAPCRAFT_FILES = ["parts", "stage", "prime"]

     

       
13
       
13
       
-
       
-_DEFAULT_PLUGINDIR = os.path.join(sys.prefix, "share", "snapcraft", "plugins")

     

       
14
       
13
       
 
       
+_DEFAULT_PLUGINDIR = os.path.join(os.sep, "nix", "store", drv, "share", "snapcraft", "plugins")

     

       
15
       
14
       
 
       
 _plugindir = _DEFAULT_PLUGINDIR

     

       
16
       
16
       
-
       
-_DEFAULT_SCHEMADIR = os.path.join(sys.prefix, "share", "snapcraft", "schema")

     

       
17
       
17
       
-
       
+_DEFAULT_SCHEMADIR = os.path.join(os.sep, "nix", "store", drv, "share", "snapcraft", "schema")

     

       
18
       
18
       
-
       
 _schemadir = _DEFAULT_SCHEMADIR

     

       
19
       
19
       
-
       
-_DEFAULT_EXTENSIONSDIR = os.path.join(sys.prefix, "share", "snapcraft", "extensions")

     

       
20
       
20
       
-
       
+_DEFAULT_EXTENSIONSDIR = os.path.join(os.sep, "nix", "store", drv, "share", "snapcraft", "extensions")

     

       
21
       
21
       
-
       
 _extensionsdir = _DEFAULT_EXTENSIONSDIR

     

       
22
       
22
       
-
       
-_DEFAULT_KEYRINGSDIR = os.path.join(sys.prefix, "share", "snapcraft", "keyrings")

     

       
23
       
23
       
-
       
+_DEFAULT_KEYRINGSDIR = os.path.join(os.sep, "nix", "store", drv, "share", "snapcraft", "keyrings")

     

       
24
       
24
       
-
       
 _keyringsdir = _DEFAULT_KEYRINGSDIR

     

       
25
       
15
       
 
       
 

     

       
26
       
26
       
-
       
 _DOCKERENV_FILE = "/.dockerenv"

     

       
16
       
16
       
+
       
 _BASE_DIR = Path(__file__).parents[2]